[jbpm-commits] JBoss JBPM SVN: r5936 - in jbpm4/trunk: qa and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Dec 9 10:01:23 EST 2009


Author: tom.baeyens at jboss.com
Date: 2009-12-09 10:01:23 -0500 (Wed, 09 Dec 2009)
New Revision: 5936

Added:
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
Modified:
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/build.xml
Log:
enterprise test suite enhancements

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-12-09 03:22:10 UTC (rev 5935)
+++ jbpm4/trunk/pom.xml	2009-12-09 15:01:23 UTC (rev 5936)
@@ -145,6 +145,11 @@
       </dependency>
       <dependency>
         <groupId>org.jbpm.jbpm4</groupId>
+        <artifactId>jbpm-test-enterprise-ejb</artifactId>
+        <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jbpm.jbpm4</groupId>
         <artifactId>jbpm-spi</artifactId>
         <version>${version}</version>
       </dependency>
@@ -701,6 +706,15 @@
       </modules>
     </profile>
 
+    <!-- PROFILE ENTERPRISE -->
+    <profile>
+      <id>enterprise</id>
+      <modules>
+        <module>modules/test-enterprise/test-enterprise-ejb</module>
+        <module>modules/test-enterprise/test-enterprise-suite</module>
+      </modules>
+    </profile>
+
     <!-- PROFILE LOAD -->
     <profile>
       <id>load</id>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-12-09 03:22:10 UTC (rev 5935)
+++ jbpm4/trunk/qa/build.xml	2009-12-09 15:01:23 UTC (rev 5936)
@@ -44,9 +44,9 @@
 
 
   <!-- ####################################### -->
-	<!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
+    <!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
   <!-- ####################################### -->
-	
+    
   <!-- DB SETUP -->
   <target name="testsuite.db.setup"
           depends="reinstall.jbpm">
@@ -61,16 +61,16 @@
 
   <!-- TOMCAT SETUP -->
   <target name="testsuite.tomcat.setup"
-  	      depends="reinstall.jbpm"> 
+            depends="reinstall.jbpm"> 
     <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" />
     <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
     <ant antfile="${jbpm.home}/install/build.xml" target="internal.install.and.start.hsqldb.if.needed" />
     <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
 
-  	<!-- to build the jbpm test webapp we start by copying the user webapp -->
-  	<mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" />
+      <!-- to build the jbpm test webapp we start by copying the user webapp -->
+      <mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" />
     <copy todir="${tomcat.home}/webapps/jbpm-test-webapp">
-    	<fileset dir="${jbpm.home}/install/generated/user-webapp"/>
+        <fileset dir="${jbpm.home}/install/generated/user-webapp"/>
     </copy>
 
     <!-- customize the configuration for the jbpm-test-webapp -->
@@ -78,14 +78,14 @@
       <fileset dir="cactus.webapp.cfg" />
     </copy>
 
-  	<!-- add examples.jar  -->
-		<ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
+      <!-- add examples.jar  -->
+        <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
     <copy file="${jbpm.home}/examples/target/examples.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />
     
     <!-- add junit.jar  -->
     <copy file="${jbpm.home}/lib/junit.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />
 
-  	<!-- add the cactus libs -->
+      <!-- add the cactus libs -->
     <copy todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib">
       <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" />
     </copy>
@@ -95,14 +95,14 @@
 
     <!-- start tomcat -->
     <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" />
-	</target>
+    </target>
 
   <!-- TOMCAT TEARDOWN -->
   <target name="testsuite.tomcat.teardown">
     <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" />
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
     <ant antfile="${jbpm.home}/install/build.xml" target="internal.stop.hsqldb.server.if.needed" />
-	</target>
+    </target>
 
   <!-- JBOSS SETUP -->
   <target name="testsuite.jboss.setup" 
@@ -112,7 +112,7 @@
     <ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" />
     <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
 
-		<ant antfile="${jbpm.home}/install/build.xml" target="internal.install.and.start.hsqldb.if.needed" />
+        <ant antfile="${jbpm.home}/install/build.xml" target="internal.install.and.start.hsqldb.if.needed" />
     <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
 
     <ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
@@ -135,9 +135,9 @@
     <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true">
       <fileset dir="cactus.webapp.cfg" />
     </copy>
-		
-	<!-- delete the jbpm configuration files -->
-	<delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" />
+        
+    <!-- delete the jbpm configuration files -->
+    <delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" />
     <delete file="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" />
 
     <!-- add examples.jar  -->
@@ -163,83 +163,80 @@
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
     <ant antfile="${jbpm.home}/install/build.xml" target="internal.stop.hsqldb.server.if.needed" />
   </target>
-	
+    
   <!-- ENTERPRISE SETUP -->
   <target name="testsuite.enterprise.setup" 
-  	        depends="reinstall.jbpm"
-	        description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
+              depends="reinstall.jbpm"
+            description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
     <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" />
-	<ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" />
-	<ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
 
-	<ant antfile="${jbpm.home}/install/build.xml" target="internal.install.and.start.hsqldb.if.needed" />
-	<ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="internal.install.and.start.hsqldb.if.needed" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
 
-	<ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
-	<mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" />
-	<copy file="${jbpm.home}/examples/target/examples.jar"
-	        todir="${jboss.server.config.dir}/deploy/jbpm/userlibs" />
+    <!-- to build the jbpm test webapp we start by copying the user webapp -->
+    <mkdir dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" />
+    <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war">
+      <fileset dir="${jbpm.home}/install/generated/user-webapp"/>
+    </copy>
 
-	<!-- to build the jbpm test webapp we start by copying the user webapp -->
-	<mkdir dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" />
-	<copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war">
-	  <fileset dir="${jbpm.home}/install/generated/user-webapp"/>
-	</copy>
+    <!-- customize the jbpm configuration for the testsuite -->
+    <copy todir="${jboss.home}/server/default/deploy/jbpm/jbpm-service.sar" overwrite="true">
+      <fileset dir="jboss.jbpm.cfg" />
+    </copy>
 
-	<!-- customize the jbpm configuration for the testsuite -->
-	<copy todir="${jboss.home}/server/default/deploy/jbpm/jbpm-service.sar" overwrite="true">
-	  <fileset dir="jboss.jbpm.cfg" />
-	</copy>
-
-	<!-- customize the configuration for the jbpm-test-webapp -->
-	<copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true">
-	  <fileset dir="cactus.webapp.cfg" />
-	</copy>
-			
+    <!-- customize the configuration for the jbpm-test-webapp -->
+    <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true">
+      <fileset dir="cactus.webapp.cfg" />
+    </copy>
+            
     <!-- delete the jbpm configuration files -->
-	<delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" />
-	<delete file="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" />
+    <delete dir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/classes" />
+    <delete file="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib/jta.jar" />
 
-	<!-- add examples.jar  -->
-	<ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
-	<copy file="${jbpm.home}/examples/target/examples.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
-	    
-	<!-- add junit.jar  -->
-	<copy file="${jbpm.home}/lib/junit.jar" todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
+    <!-- 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" 
+    	    todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
+        
+    <!-- add junit.jar  -->
+    <copy file="${jbpm.home}/lib/junit.jar" 
+    	    todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
 
-	<!-- add the cactus libs -->
-	<copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib">
-	  <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" />
-	</copy>
+    <!-- add the cactus libs -->
+    <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib">
+      <fileset dir="../modules/test-cactus/target/jbpm.test.webapp.libs" />
+    </copy>
 
-	<!-- start jboss -->
-	<ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" />
+    <!-- start jboss
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" />
+    -->
   </target>
-	
+    
 
   <!-- ENTERPRISE TEARDOWN -->
   <target name="testsuite.enterprise.teardown"
-	          description="drops the jbpm schema and stops jboss">
+              description="drops the jbpm schema and stops jboss">
     <ant antfile="${jbpm.home}/install/build.xml" target="stop.jboss" />
-	<ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
-	<ant antfile="${jbpm.home}/install/build.xml" target="internal.stop.hsqldb.server.if.needed" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="internal.stop.hsqldb.server.if.needed" />
   </target>
-	
-		
+    
+        
   <!-- ################ -->
   <!-- ### UPGRADE  ### -->
   <!-- ################ -->
   <property name="old.jbpm.home" value="${jbpm.parent.dir}/jbpm-${old.jbpm.version}" />
   <target name="testsuite.upgrade.setup" depends="reinstall.jbpm">
     <fail message="old.jbpm.version is a mandatory property" unless="old.jbpm.version" />
-  	<!-- install old jbpm version -->
+      <!-- install old jbpm version -->
     <delete dir="${old.jbpm.home}" />
     <unzip src="upgrade/target/jbpm-distro-${old.jbpm.version}.jar" dest="${jbpm.parent.dir}" />
     <!-- copy the oracle driver jar -->
-  	<antcall target="copy.oracle.driver" />
+      <antcall target="copy.oracle.driver" />
     <!-- create jdbc properties files for PVM2 based on the originals -->
     <delete dir="upgrade/target/jdbc" />
-  	<mkdir dir="upgrade/target/jdbc" />
+      <mkdir dir="upgrade/target/jdbc" />
     <copy todir="upgrade/target/jdbc">
       <fileset dir="jdbc" />
     </copy>
@@ -251,18 +248,18 @@
     <copy todir="upgrade/target/jdbc" overwrite="true" failonerror="false">
       <fileset dir="${user.home}/.jbpm4/jdbc" />
     </copy>
-  	<!-- install the jbpm-test-upgrade lib -->
+      <!-- install the jbpm-test-upgrade lib -->
     <delete dir="upgrade/target/jbpm-test-upgrade" />
     <mkdir dir="upgrade/target/jbpm-test-upgrade" />
     <unzip dest="upgrade/target/jbpm-test-upgrade" src="upgrade/target/jbpm-test-upgrade.jar" />
-  	<delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" />
+      <delete file="upgrade/target/jbpm-test-upgrade/hibernate.properties" />
     <!-- create jbpm schema using the old jbpm distro -->
     <condition property="is.old.jbpm.40">
       <equals arg1="${old.jbpm.version}" arg2="4.0" />
     </condition>
     <antcall target="create.jbpm.schema.in.jbpm.40" />
     <antcall target="create.jbpm.schema.in.jbpm.41plus" />
-  	<!-- start couple of processes using the old jbpm version -->
+      <!-- start couple of processes using the old jbpm version -->
     <copy todir="upgrade/target/jbpm-test-upgrade" overwrite="true">
       <fileset dir="upgrade/cfg" />
     </copy>
@@ -277,15 +274,15 @@
         </fileset>
       </classpath>
     </java>
-  	<!-- upgrade -->
+      <!-- upgrade -->
     <copy todir="${jbpm.home}/install/jdbc" overwrite="true">
       <fileset dir="upgrade/target/jdbc" />
     </copy>
-  	<ant antfile="${jbpm.home}/install/build.xml" target="upgrade.jbpm.schema" inheritall="false">
-  		<property name="database" value="${database}" />
+      <ant antfile="${jbpm.home}/install/build.xml" target="upgrade.jbpm.schema" inheritall="false">
+          <property name="database" value="${database}" />
       <property name="tx" value="standalone.testsuite" />
       <!--property name="logging" value="debug" /-->
-  	</ant>
+      </ant>
   </target>
 
   <target name="copy.oracle.driver" if="is.oracle">
@@ -295,19 +292,19 @@
 
   <target name="start.hsqldb" if="is.hsqldb">
     <delete dir="upgrade/target/hsqldb" />
-  	<mkdir dir="upgrade/target/hsqldb" />
-  	<java classname="org.hsqldb.Server" dir="upgrade/target/hsqldb" fork="true">
-  		<arg line="-address localhost -port 1701 -dbname.0 jbpmDatabase" />
-  		<classpath>
+      <mkdir dir="upgrade/target/hsqldb" />
+      <java classname="org.hsqldb.Server" dir="upgrade/target/hsqldb" fork="true">
+          <arg line="-address localhost -port 1701 -dbname.0 jbpmDatabase" />
+          <classpath>
         <fileset dir="upgrade/target">
           <include name="hsqldb.jar"/>
         </fileset>
-  		</classpath>
-  	</java>
+          </classpath>
+      </java>
   </target>
-	
+    
   <target name="stop.hsqldb" if="is.hsqldb">
-  	<property file="upgrade/target/jdbc/${database}.properties" />
+      <property file="upgrade/target/jdbc/${database}.properties" />
     <path id="hsqldb.classpath">
       <fileset dir="upgrade/target">
         <include name="hsqldb.jar"/>
@@ -317,9 +314,9 @@
        password="${jdbc.password}" 
        url="${jdbc.url}" 
        userid="${jdbc.username}" 
-    	 onerror="continue"
-    	 autocommit="true"
-    	 classpathref="hsqldb.classpath">SHUTDOWN</sql>
+         onerror="continue"
+         autocommit="true"
+         classpathref="hsqldb.classpath">SHUTDOWN</sql>
   </target>
 
   <target name="create.jbpm.schema.in.jbpm.40" if="is.old.jbpm.40">
@@ -328,22 +325,22 @@
     <copy todir="${old.jbpm.home}/db/jdbc">
       <fileset dir="upgrade/target/jdbc" />
     </copy>
-  	<replace file="upgrade/target/jbpm-test-upgrade/jbpm.cfg.xml">
-  		<replacetoken><![CDATA[<import resource="jbpm.businesscalendar.cfg.xml" />]]></replacetoken>
-  		<replacevalue></replacevalue>
-  	</replace>
-  	<ant antfile="${old.jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false">
-  		<property name="database" value="${database}" />
-  	</ant>
+      <replace file="upgrade/target/jbpm-test-upgrade/jbpm.cfg.xml">
+          <replacetoken><![CDATA[<import resource="jbpm.businesscalendar.cfg.xml" />]]></replacetoken>
+          <replacevalue></replacevalue>
+      </replace>
+      <ant antfile="${old.jbpm.home}/db/build.xml" target="create.jbpm.schema" inheritall="false">
+          <property name="database" value="${database}" />
+      </ant>
     <copy file="${old.jbpm.home}/db/hibernate.cfg/${database}.hibernate.cfg.xml" 
-    	    tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" 
-    	    overwrite="true">
-    	<filterset filtersfile="upgrade/target/jdbc/${database}.properties" />
+            tofile="upgrade/target/jbpm-test-upgrade/jbpm.hibernate.cfg.xml" 
+            overwrite="true">
+        <filterset filtersfile="upgrade/target/jdbc/${database}.properties" />
     </copy>
   </target>
 
   <target name="create.jbpm.schema.in.jbpm.41plus" unless="is.old.jbpm.40">
-  	<echo message="creating schema in jbpm 4.1+" />
+      <echo message="creating schema in jbpm 4.1+" />
     <!-- copy the PVM2 jdbc properties files in the old jbpm distro -->
     <copy todir="${old.jbpm.home}/install/jdbc">
       <fileset dir="upgrade/target/jdbc" />
@@ -360,7 +357,7 @@
   
   <target name="testsuite.upgrade.teardown">
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" inheritall="false" />
-  	<antcall target="stop.hsqldb" />
+      <antcall target="stop.hsqldb" />
   </target>
 
   <!-- ############################################ -->

Added: jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	                        (rev 0)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-09 15:01:23 UTC (rev 5936)
@@ -0,0 +1,15 @@
+ at echo off
+rem runs the jboss integration test suite
+
+set MAVEN_OPTS=-Xms1024m -Xmx1024m
+set ANT_PROPERTIES="-Djboss.version=5.1.0.GA"
+echo ANT_PROPERTIES=%ANT_PROPERTIES%
+
+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-suite
+rem   mvn -Pruntest test
+rem   cd ../..
+
+rem   ant -f qa/build.xml %ANT_PROPERTIES% testsuite.enterprise.teardown



More information about the jbpm-commits mailing list