[jbpm-commits] JBoss JBPM SVN: r5944 - in jbpm4/trunk: modules/test-enterprise/test-enterprise-suite and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Dec 11 00:54:52 EST 2009


Author: koen.aers at jboss.com
Date: 2009-12-11 00:54:52 -0500 (Fri, 11 Dec 2009)
New Revision: 5944

Modified:
   jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh
Log:
enterprise test suite and hudson scripts are working

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-ejb/pom.xml	2009-12-11 05:54:52 UTC (rev 5944)
@@ -11,7 +11,7 @@
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
     <version>4.3-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <dependencies>

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-11 05:54:52 UTC (rev 5944)
@@ -53,37 +53,56 @@
       </properties>
       <build>
         <plugins>
-		      <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-dependency-plugin</artifactId>
-		        <executions>
-		          <execution>
-		            <id>copy.libs</id>
-		            <phase>package</phase>
-		            <goals>
-		              <goal>copy</goal>
-		            </goals>
-		            <configuration>
-                    <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
-		              <artifactItems>
-		                <artifactItem>
-		                  <groupId>aspectj</groupId>
-		                  <artifactId>aspectjrt</artifactId>
-		                </artifactItem>
-                        <artifactItem>
-                          <groupId>cactus</groupId>
-                          <artifactId>cactus.core</artifactId>
-                        </artifactItem>
-                        <artifactItem>
-                          <groupId>commons-logging</groupId>
-                          <artifactId>commons-logging</artifactId>
-                          <version>1.1</version>
-                        </artifactItem>
-		              </artifactItems>
-		            </configuration>
-		          </execution>
-		        </executions>
-		      </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-test-jar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>test-jar</goal>
+                </goals>
+                <configuration>
+                  <excludes>
+                    <exclude>jbpm-test-destinations-service.xml</exclude>
+                    <exclude>cactus.properties</exclude>
+                    <exclude>META-INF/*</exclude>
+                  </excludes> 
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+		  <plugin>
+		    <groupId>org.apache.maven.plugins</groupId>
+		    <artifactId>maven-dependency-plugin</artifactId>
+		    <executions>
+		      <execution>
+		        <id>copy.libs</id>
+		        <phase>package</phase>
+		        <goals>
+		          <goal>copy</goal>
+		        </goals>
+		        <configuration>
+                  <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
+		          <artifactItems>
+		            <artifactItem>
+		              <groupId>aspectj</groupId>
+		              <artifactId>aspectjrt</artifactId>
+		            </artifactItem>
+                    <artifactItem>
+                      <groupId>cactus</groupId>
+                      <artifactId>cactus.core</artifactId>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>commons-logging</groupId>
+                      <artifactId>commons-logging</artifactId>
+                      <version>1.1</version>
+                    </artifactItem>
+		          </artifactItems>
+		        </configuration>
+		      </execution>
+		    </executions>
+		  </plugin>
         </plugins>
       </build>
     </profile>

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	2009-12-11 05:54:52 UTC (rev 5944)
@@ -12,5 +12,9 @@
 		servletTestSuite.addTestSuite(JmsTest.class);
 		return servletTestSuite;
 	}
+	
+	public void testSanity() {
+		assertTrue(true);
+	}
 
 }

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/qa/build.xml	2009-12-11 05:54:52 UTC (rev 5944)
@@ -196,7 +196,7 @@
     <delete file="${jboss.home}/server/default/deploy/jbpm-test/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" />
 
     <!-- copy the test classes to the test web app  -->
-    <copy file="../modules/test-enterprise/test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}.jar" 
+    <copy file="../modules/test-enterprise/test-enterprise-suite/target/jbpm-test-enterprise-suite-${jbpm.version}-tests.jar" 
     	    todir="${jboss.home}/server/default/deploy/jbpm-test/jbpm-test-webapp.war/WEB-INF/lib" />
         
     <!-- add junit.jar  -->

Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-11 05:54:52 UTC (rev 5944)
@@ -8,8 +8,8 @@
 cmd /C mvn -U -Pdistro,enterprise clean install
 cmd /C ant -f qa/build.xml %ANT_PROPERTIES% testsuite.enterprise.setup
 
-rem   cd modules/test-enterprise/test-enterprise-suite
-rem   mvn -Pruntest test
-rem   cd ../..
+cd modules\test-enterprise\test-enterprise-suite
+cmd /C  mvn -Pruntest test
+cd ..\..\..
 
-rem   ant -f qa/build.xml %ANT_PROPERTIES% testsuite.enterprise.teardown
+cmd /C ant -f qa/build.xml %ANT_PROPERTIES% testsuite.enterprise.teardown

Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh	2009-12-10 17:02:19 UTC (rev 5943)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh	2009-12-11 05:54:52 UTC (rev 5944)
@@ -9,8 +9,8 @@
 mvn -U -Pdistro,enterprise clean install
 ant -f qa/build.xml $ANT_PROPERTIES testsuite.enterprise.setup
 
-#cd modules/test-enterprise/test-enterprise-suite
-#mvn -Pruntest test
-#cd ../../..
+cd modules/test-enterprise/test-enterprise-suite
+mvn -Pruntest test
+cd ../../..
 
-#ant -f qa/build.xml $ANT_PROPERTIES testsuite.enterprise.teardown
+ant -f qa/build.xml $ANT_PROPERTIES testsuite.enterprise.teardown



More information about the jbpm-commits mailing list