[jbpm-commits] JBoss JBPM SVN: r5448 - in jbpm4/trunk: modules/distro/src/main/files/install and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Aug 7 17:25:41 EDT 2009


Author: tom.baeyens at jboss.com
Date: 2009-08-07 17:25:41 -0400 (Fri, 07 Aug 2009)
New Revision: 5448

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/user-webapp/
   jbpm4/trunk/qa/jbpm.test.webapp/
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.cfg.xml
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.hibernate.cfg.xml
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.properties
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.templates.examples.xml
   jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/web.xml
Removed:
   jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp/
   jbpm4/trunk/qa/jbpm.cfg/
Modified:
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
   jbpm4/trunk/modules/test-cactus/pom.xml
   jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java
   jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties
   jbpm4/trunk/pom.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
Log:
JBPM-2409 JBPM-2411 added hudson integration test script for tomcat

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -42,19 +42,19 @@
 
   <!-- ### CREATE CONFIGURATION ########################################### -->
 	<target name="create.cfg" description="Creates a configuration in dir generated/cfg">
-    <delete dir="generated/cfg" />
-    <mkdir dir="generated/cfg" />
-		<copy tofile="generated/cfg/jbpm.cfg.xml" 
-			    file="src/cfg/jbpm/${tx}.jbpm.cfg.xml" />
-    <copy tofile="generated/cfg/jbpm.hibernate.cfg.xml" 
-    	    file="src/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml">
-      <filterset filtersfile="src/jdbc/${database}.properties" />
+    <delete dir="${jbpm.home}/install/generated/cfg" />
+    <mkdir dir="${jbpm.home}/install/generated/cfg" />
+		<copy tofile="${jbpm.home}/install/generated/cfg/jbpm.cfg.xml" 
+			    file="${jbpm.home}/install/src/cfg/jbpm/${tx}.jbpm.cfg.xml" />
+    <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.hibernate.cfg.xml" 
+    	    file="${jbpm.home}/install/src/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml">
+      <filterset filtersfile="${jbpm.home}/install/src/jdbc/${database}.properties" />
     </copy>
-    <copy todir="generated/cfg">
-    	<fileset dir="src/cfg/logging/${logging}" />
+    <copy todir="${jbpm.home}/install/generated/cfg">
+    	<fileset dir="${jbpm.home}/install/src/cfg/logging/${logging}" />
     </copy>
-    <copy tofile="generated/cfg/jbpm.mail.properties" 
-          file="src/cfg/mail/jbpm.mail.properties">
+    <copy tofile="${jbpm.home}/install/generated/cfg/jbpm.mail.properties" 
+          file="${jbpm.home}/install/src/cfg/mail/jbpm.mail.properties">
       <filterset>
       	<filter token="mail.smtp.host" value="${mail.smtp.host}" />
       </filterset>
@@ -65,18 +65,18 @@
   <target name="create.user.webapp"
   	      depends="create.cfg"
   	      description="Generates a configuration in dir generated/cfg">
-    <delete dir="generated/user.webapp" />
-    <mkdir dir="generated/user.webapp/WEB-INF/classes" />
-    <mkdir dir="generated/user.webapp/WEB-INF/lib" />
-  	<copy todir="generated/user.webapp">
-  		<fileset dir="src/user.webapp"/>
+    <delete dir="${jbpm.home}/install/generated/user-webapp" />
+    <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes" />
+    <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
+  	<copy todir="${jbpm.home}/install/generated/user-webapp">
+  		<fileset dir="${jbpm.home}/install/src/user-webapp"/>
     </copy>
-  	<copy todir="generated/user.webapp/WEB-INF/classes">
-  		<fileset dir="generated/cfg">
+  	<copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes">
+  		<fileset dir="${jbpm.home}/install/generated/cfg">
   			<exclude name="logging.properties" />
   		</fileset>
     </copy>
-    <copy todir="generated/user.webapp/WEB-INF/lib">
+    <copy todir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib">
       <fileset dir="${jbpm.home}">
         <include name="jbpm.jar" />
       </fileset>
@@ -95,16 +95,11 @@
         <include name="mail.jar" />
         <include name="slf4j-api.jar" />
         <include name="slf4j-jdk14.jar" />
-        <include name="gwt-console-server-integration.jar" />
-        <include name="gwt-console-rpc.jar" />
-        <include name="jbpm-console-integration.jar" />
-        <include name="jbpm-console-form-plugin.jar" />
-        <include name="jbpm-console-graphView-plugin.jar"/>
       </fileset>
     </copy>
   	
     <!-- copy database driver -->
-    <property name="database.driver.destination.dir" value="generated/user.webapp/WEB-INF/lib" />
+    <property name="database.driver.destination.dir" value="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
   	<property name="is.tomcat" value="true" />
     <antcall target="internal.copy.database.driver" />
   </target>
@@ -367,11 +362,15 @@
   <!-- ### STOP TOMCAT ################################################### -->
   <target name="stop.tomcat" 
           description="Signals Tomcat to stop, but doesn't wait till its finished">
-    <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
-      <arg line="-S"/>
+    <exec executable="${tomcat.home}/bin/catalina.bat"
+    	    dir="${tomcat.home}/bin"
+    	    os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+      <arg line="stop"/>
     </exec>
-    <exec executable="${jboss.home}/bin/shutdown.sh" os="Linux, Unix, Mac">
-      <arg line="-S"/>
+    <exec executable="${tomcat.home}/bin/catalina.sh" 
+          dir="${tomcat.home}/bin"
+    	    os="Linux, Unix, Mac">
+      <arg line="stop"/>
     </exec>
   </target>
   

Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/user-webapp (from rev 5447, jbpm4/trunk/modules/distro/src/main/files/install/src/user.webapp)

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java	2009-08-07 21:25:41 UTC (rev 5448)
@@ -32,11 +32,11 @@
 public class Launcher extends Thread {
 
   Task task;
-  String command;
+  String[] command;
   String endMsg;
   File dir;
 
-  public Launcher(Task task, String command, String endMsg, String dir) {
+  public Launcher(Task task, String[] command, String endMsg, String dir) {
     this.task = task;
     this.command = command;
     this.endMsg = endMsg;
@@ -58,7 +58,7 @@
         task.log(line);
       }
 
-      task.log("'" + command + "' started.");
+      task.log("'" + command[0] + "' started.");
     } catch (IOException e) {
       throw new BuildException("couldn't start '" + command + "'", e);
     }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java	2009-08-07 21:25:41 UTC (rev 5448)
@@ -38,15 +38,20 @@
       String os = getProject().getProperty( "os.name" ).toLowerCase();
       
       // build the command string
-      String command = null; 
+      String[] command = null; 
       if ( os.indexOf( "windows" ) != -1 ) {
-        command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter();          
+        command = new String[]{getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat"};          
       } else if ( os.indexOf( "linux" ) != -1 || os.indexOf( "mac" ) != -1) {
-        command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter();
+        command = new String[]{getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh"};
       } else {
         throw new BuildException( "os '" + os + "' not supported in the startjboss task." );
       }
+      
+      if (configuration!=null) {
+        command = new String[]{command[0], "-c "+configuration};
+      }
 
+
       // launch the command and wait till the END_MESSAGE appears
       Thread launcher = new Launcher(this, command, END_MESSAGE, null);
       launcher.start();
@@ -68,11 +73,6 @@
     throw new BuildException("startjboss couldn't figure out which jboss to start: attribute jbosshome not specified and property jboss.home was not set");
   }
 
-  String getConfigParameter() {
-    if (configuration==null) return "";
-    return "-c "+configuration;
-  }
-
   public void setConfiguration(String configuration) {
     this.configuration = configuration;
   }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartTomcatTask.java	2009-08-07 21:25:41 UTC (rev 5448)
@@ -42,11 +42,11 @@
       String os = getProject().getProperty( "os.name" ).toLowerCase();
       
       // build the command string
-      String command = null; 
+      String[] command = null; 
       if ( os.indexOf( "windows" ) != -1 ) {
-        command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.bat run";          
+        command = new String[] {getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.bat", "run"};          
       } else if ( os.indexOf( "linux" ) != -1 || os.indexOf( "mac" ) != -1) {
-        command = getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.sh run";
+        command = new String[] {getTomcatHome() + fileSeparator + "bin" + fileSeparator + "catalina.sh", "run"};
       } else {
         throw new BuildException( "os '" + os + "' not supported in the start-tomcat task." );
       }

Modified: jbpm4/trunk/modules/test-cactus/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-cactus/pom.xml	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/test-cactus/pom.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -64,7 +64,7 @@
 		              <goal>copy</goal>
 		            </goals>
 		            <configuration>
-                  <outputDirectory>target/warlibs</outputDirectory>
+                  <outputDirectory>target/jbpm.test.webapp.libs</outputDirectory>
 		              <artifactItems>
 		                <artifactItem>
 		                  <groupId>aspectj</groupId>
@@ -103,9 +103,17 @@
                       <classifier>tests</classifier>
                     </artifactItem>
                     <artifactItem>
+                      <groupId>org.jbpm.jbpm4</groupId>
+                      <artifactId>jbpm-console-reports</artifactId>
+                    </artifactItem>
+                    <artifactItem>
                       <groupId>org.subethamail</groupId>
                       <artifactId>subethasmtp-wiser</artifactId>
                     </artifactItem>
+                    <artifactItem>
+                      <groupId>org.subethamail</groupId>
+                      <artifactId>subethasmtp-smtp</artifactId>
+                    </artifactItem>
 		              </artifactItems>
 		            </configuration>
 		          </execution>
@@ -173,7 +181,7 @@
 		                <echo message="${test_classpath}" />
 		                <java classname="org.jbpm.cactustool.CactusTestGenerator">
 		                  <classpath path="${test_classpath}"/>
-		                  <arg line="src/test/java ../examples/src/test/java" />
+		                  <arg line="src/test/java ../examples/src/test/java ../test-db/src/test/java" />
 		                </java>
 		              </tasks>
 		            </configuration>

Modified: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java
===================================================================
--- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java	2009-08-07 21:25:41 UTC (rev 5448)
@@ -44,6 +44,72 @@
     suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest.class);
     suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest.class);
     suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest.class);
+    suite.addTestSuite(org.jbpm.examples.async.eventlistener.AsyncEventListenerTest.class);
+    suite.addTestSuite(org.jbpm.examples.goup.concurrency.GroupConcurrencyTest.class);
+    suite.addTestSuite(org.jbpm.examples.goup.multipleentries.MultipleEntriesTest.class);
+    suite.addTestSuite(org.jbpm.examples.goup.simple.GroupSimpleTest.class);
+    suite.addTestSuite(org.jbpm.examples.goup.timer.GroupTimerTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.DecisionTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.ForkJoinInSameTransactionTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.ForkTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.ForkToTaskTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.GroupBasicsTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.GroupTimersTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.JoinTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.StatesJoinEndTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.StateTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.SubProcessTest.class);
+    suite.addTestSuite(org.jbpm.test.activities.TasksJoinEndTest.class);
+    suite.addTestSuite(org.jbpm.test.async.AsyncBasicsTest.class);
+    suite.addTestSuite(org.jbpm.test.async.AsyncEndCombinationTest.class);
+    suite.addTestSuite(org.jbpm.test.async.AsyncEventListenerOnEndTest.class);
+    suite.addTestSuite(org.jbpm.test.auth.UserProvidedAuthenticationTest.class);
+    suite.addTestSuite(org.jbpm.test.cfg.ConfigurationTest.class);
+    suite.addTestSuite(org.jbpm.test.deploy.DeploymentQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.deploy.ImageTest.class);
+    suite.addTestSuite(org.jbpm.test.deploy.SuspendDeploymentTest.class);
+    suite.addTestSuite(org.jbpm.test.eventlistener.EventListenerTest.class);
+    suite.addTestSuite(org.jbpm.test.eventlistener.HqlEventListenerTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.ConcurrentEndTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.ExecutionEagerLoadingTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.ExecutionQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.FindExecutionTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.SignalExecutionTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.StartExecutionTest.class);
+    suite.addTestSuite(org.jbpm.test.execution.SystemVariablesTest.class);
+    suite.addTestSuite(org.jbpm.test.history.AvgDurationTest.class);
+    suite.addTestSuite(org.jbpm.test.history.ChoiceDistributionTest.class);
+    suite.addTestSuite(org.jbpm.test.history.EndProcessInstanceTest.class);
+    suite.addTestSuite(org.jbpm.test.history.HistoryActivityInstanceQeuryTest.class);
+    suite.addTestSuite(org.jbpm.test.history.HistoryDetailQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.history.HistoryTaskAssigneeTest.class);
+    suite.addTestSuite(org.jbpm.test.history.ProcessInstanceHistoryTest.class);
+    suite.addTestSuite(org.jbpm.test.identity.IdentityTest.class);
+    suite.addTestSuite(org.jbpm.test.mgmt.JobQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.process.ActivityCoordinatesTest.class);
+    suite.addTestSuite(org.jbpm.test.process.DeploymentResourcesTest.class);
+    suite.addTestSuite(org.jbpm.test.process.DescriptionTest.class);
+    suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class);
+    suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class);
+    suite.addTestSuite(org.jbpm.test.reporting.SQLStmtTest.class);
+    suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskListTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskParticipationsTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskPropertiesTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskQueryCandidatesTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskQueryProcessTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskQueryTest.class);
+    suite.addTestSuite(org.jbpm.test.task.TaskVariablesTest.class);
+    suite.addTestSuite(org.jbpm.test.taskactivity.TaskCandidatesTest.class);
+    suite.addTestSuite(org.jbpm.test.taskactivity.TaskCompletionTest.class);
+    suite.addTestSuite(org.jbpm.test.taskactivity.TaskOutcomesTest.class);
+    suite.addTestSuite(org.jbpm.test.taskactivity.TaskReassignTest.class);
+    suite.addTestSuite(org.jbpm.test.timer.TimerTest.class);
+    suite.addTestSuite(org.jbpm.test.variables.BasicVariablesTest.class);
+    suite.addTestSuite(org.jbpm.test.variables.VariableBasicTypesTest.class);
     return suite;
   }
 }

Modified: jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties
===================================================================
--- jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/modules/test-cactus/src/test/resources/cactus.properties	2009-08-07 21:25:41 UTC (rev 5448)
@@ -1 +1 @@
-cactus.contextURL=http://localhost:8080/jbpm-test-cactus
+cactus.contextURL=http://localhost:8080/jbpm-test-webapp

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/pom.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -347,11 +347,16 @@
         <version>${spring.version}</version>
       </dependency>
       <dependency>
-      	<groupId>org.subethamail</groupId>
-      	<artifactId>subethasmtp-wiser</artifactId>
-      	<version>${wiser.version}</version>
+        <groupId>org.subethamail</groupId>
+        <artifactId>subethasmtp-wiser</artifactId>
+        <version>${wiser.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.subethamail</groupId>
+        <artifactId>subethasmtp-smtp</artifactId>
+        <version>${wiser.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>wstx-lgpl</artifactId>
         <version>${woodstox.version}</version>

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/qa/build.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -19,11 +19,14 @@
   <property name="jboss.server.configuration" value="default" />
   <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" />
 
+  <property name="tomcat.version" value="6.0.20" />
+  <property name="tomcat.parent.dir" value="${jbpm.home}" />
+  <property name="tomcat.home" value="${tomcat.parent.dir}/apache-tomcat-${tomcat.version}" />
+
   <!-- DERIVED PROPERTIES -->
   <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" />
   <property name="jbpm.distro.dir" value="../modules/distro/target" />
   <property name="jbpm.distro.path" value="${jbpm.distro.dir}/jbpm-${jbpm.version}.zip" />
-  <property name="jbpm.home" value="${workspace}/jbpm-${jbpm.version}" />
 
   <condition property="jbpm.identity.idm">
   	<equals arg1="${identity.component}" arg2="jboss.idm"/>
@@ -35,58 +38,55 @@
   <echo message="jbpm.distro.path.. ${jbpm.distro.path}" />
 
 
-  <!-- DELETE JBPM INSTALLATION -->
-  <target name="delete.jbpm.installation"
-            description="deletes ${jbpm.home}">
-      <delete dir="${jbpm.home}" />
-  </target>
-
-  <!-- INSTALL JBPM -->
-  <target name="install.jbpm"
-          description="unzips the jbpm distro file in the ${jbpm.parent.dir}">
-    <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />
-  </target>
-
   <!-- REINSTALL JBPM -->
   <target name="reinstall.jbpm" 
-          depends="delete.jbpm.installation, install.jbpm" 
-          description="deletes the jbpm installation and then reinstalls jbpm"/>
+          description="deletes the jbpm installation and then reinstalls jbpm">
+    <delete dir="${jbpm.home}" />
+    <unzip src="${jbpm.distro.path}" dest="${jbpm.parent.dir}" />
+	</target>
 
-  <!-- REINSTALL TOMCAT AND JBPM -->
-  <target name="reinstall.tomcat.and.jbpm">
-    <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat.and.jbpm" />
-  </target>
+  <!-- TOMCAT INTEGRATION TESTSUITE SETUP -->
+  <target name="tomcat.integration.testsuite.setup"
+  	      depends="reinstall.jbpm"> 
+    <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.tomcat" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
 
-  <!-- CUSTOMIZE TOMCAT FOR INTEGRATION TESTSUITE -->
-	<target name="customize.tomcat.for.integration.testsuite">
-		<!-- add the examples.jar to the tomcat libs dir -->
+  	<!-- to build the jbpm test webapp we start by copying the user webapp -->
+  	<echo message="sldjkflskdfj" />
+  	<mkdir dir="${tomcat.home}/webapps/jbpm-test-webapp" />
+    <copy todir="${tomcat.home}/webapps/jbpm-test-webapp">
+    	<fileset dir="${jbpm.home}/install/generated/user-webapp"/>
+    </copy>
+
+    <!-- customize the configuration for the jbpm-test-webapp -->
+    <copy todir="${tomcat.home}/webapps/jbpm-test-webapp" overwrite="true">
+      <fileset dir="jbpm.test.webapp" />
+    </copy>
+
+  	<!-- add examples.jar  -->
 		<ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
-    <copy file="${jbpm.home}/examples/target/examples.jar" todir="${tomcat.home}/lib" />
+    <copy file="${jbpm.home}/examples/target/examples.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />
     
-    <!-- add the junit.jar to the tomcat libs dir -->
-    <copy file="${jbpm.home}/lib/junit.jar" todir="${tomcat.home}/lib" />
-		
-		<!-- customize the jbpm configuration for the testsuite -->
-		<jar destfile="${tomcat.home}/lib/jbpm.cfg.jar">
-			<fileset dir="jbpm.cfg/tomcat" />
-		</jar>
+    <!-- add junit.jar  -->
+    <copy file="${jbpm.home}/lib/junit.jar" todir="${tomcat.home}/webapps/jbpm-test-webapp/WEB-INF/lib" />
 
-		<!-- copy the cactus war file -->
-		<war destfile="${tomcat.home}/webapps/jbpm-test-cactus.war">
-			<fileset dir="modules/test-cactus/src/main/webapp" />
-			<classes dir="modules/test-cactus/target/test-classes" />
-			<lib dir="modules/test-cactus/target/lib">
-			</lib>
-		</war>
+  	<!-- 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>
+
+    <!-- start tomcat -->
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" />
 	</target>
 
-  <!-- START TOMCAT -->
-  <target name="start.tomcat">
-    <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" />
-  </target>
+  <!-- TOMCAT INTEGRATION TESTSUITE TEARDOWN -->
+  <target name="tomcat.integration.testsuite.teardown">
+    <!-- stop tomcat -->
+    <ant antfile="${jbpm.home}/install/build.xml" target="stop.tomcat" />
+	</target>
+
 	
-	
-  <target name="integration.testrun.setup" 
+	<target name="integration.testrun.setup" 
           depends="reinstall.jbpm, post.install"
           description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
     <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss" />

Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat	2009-08-07 15:56:43 UTC (rev 5447)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat	2009-08-07 21:25:41 UTC (rev 5448)
@@ -1,15 +1,12 @@
 set MAVEN_OPTS=-Xms1024M -Xmx1024M
 
 cmd /C mvn -U -Pdistro,integration clean install
-cmd /C ant -f qa/build.xml reinstall.jbpm
-cmd /C ant -f qa/build.xml reinstall.tomcat.and.jbpm
-cmd /C ant -f qa/build.xml customize.tomcat.for.integration.testsuite
-cmd /C ant -f qa/build.xml start.tomcat
+cmd /C ant -f qa/build.xml tomcat.integration.testsuite.setup
 
 cd modules\test-cactus
 cmd /C mvn -Pruntest test
 cd ..\..
 
-cmd /C ant -f qa/build.xml stop.tomcat
+cmd /C ant -f qa/build.xml tomcat.integration.testsuite.teardown
 
 echo 

Copied: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.cfg.xml (from rev 5447, jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.cfg.xml)
===================================================================
--- jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.cfg.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.tx.hibernate.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <!-- import resource="jbpm.jobexecutor.cfg.xml" / -->
+
+  <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.hibernate.cfg.xml (from rev 5447, jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.hibernate.cfg.xml)
===================================================================
--- jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.hibernate.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.hibernate.cfg.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE hibernate-configuration PUBLIC
+          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+	<session-factory>
+
+		<property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+    <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
+    <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property>
+    <property name="hibernate.connection.username">sa</property>
+    <property name="hibernate.connection.password"></property>
+    <property name="hibernate.hbm2ddl.auto">create-drop</property>
+    <property name="hibernate.format_sql">true</property>
+
+		<mapping resource="jbpm.repository.hbm.xml" />
+		<mapping resource="jbpm.execution.hbm.xml" />
+		<mapping resource="jbpm.history.hbm.xml" />
+		<mapping resource="jbpm.task.hbm.xml" />
+		<mapping resource="jbpm.identity.hbm.xml" />
+
+	</session-factory>
+</hibernate-configuration>


Property changes on: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.hibernate.cfg.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.properties (from rev 5447, jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.properties)
===================================================================
--- jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.properties	                        (rev 0)
+++ jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.properties	2009-08-07 21:25:41 UTC (rev 5448)
@@ -0,0 +1,3 @@
+mail.smtp.host	localhost
+mail.smtp.port	2525
+mail.from		noreply at jbpm.org
\ No newline at end of file


Property changes on: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.templates.examples.xml (from rev 5447, jbpm4/trunk/qa/jbpm.cfg/tomcat/jbpm.mail.templates.examples.xml)
===================================================================
--- jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.templates.examples.xml	                        (rev 0)
+++ jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.templates.examples.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <process-engine-context>
+
+    <mail-template name="rectify-template">
+      <to addresses="${addressee}" />
+      <cc users="bb" groups="innerparty" />
+      <bcc groups="thinkpol" />
+      <subject>rectify ${newspaper}</subject>
+      <text>${newspaper} ${date} ${details}</text>
+    </mail-template>
+
+  </process-engine-context>
+
+</jbpm-configuration>
\ No newline at end of file


Property changes on: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/classes/jbpm.mail.templates.examples.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/web.xml
===================================================================
--- jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/web.xml	                        (rev 0)
+++ jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/web.xml	2009-08-07 21:25:41 UTC (rev 5448)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+
+<web-app>
+
+  <servlet>
+    <servlet-name>ServletRedirector</servlet-name>
+    <servlet-class>org.apache.cactus.server.ServletTestRedirector</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>ServletRedirector</servlet-name>
+    <url-pattern>/ServletRedirector</url-pattern>
+  </servlet-mapping>
+
+</web-app>


Property changes on: jbpm4/trunk/qa/jbpm.test.webapp/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain



More information about the jbpm-commits mailing list