[jbpm-commits] JBoss JBPM SVN: r5938 - in jbpm4/trunk: modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test and 12 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Dec 9 23:36:27 EST 2009


Author: koen.aers at jboss.com
Date: 2009-12-09 23:36:26 -0500 (Wed, 09 Dec 2009)
New Revision: 5938

Added:
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/
   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/resources/jbpm-test-destinations-service.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
Removed:
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/EjbTest.java
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/JmsTest.java
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-destinations-service.xml
Modified:
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/.classpath
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
   jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh
Log:
setup of the enterprise test suite continued

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/.classpath
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/.classpath	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/.classpath	2009-12-10 04:36:26 UTC (rev 5938)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,16 @@
+<project name="test" basedir=".">
+  <property name="deploy.dir" value="/Users/koen/Temp/jboss-5.0.0.GA/server/default/deploy/jbpm"/>
+  <target name="deploy-beans">
+  	<mkdir dir="${deploy.dir}"/>
+  	<jar destfile="jbpm-test-enterprise-ejb.jar" basedir="../test-enterprise-ejb/target/classes"/>
+  	<copy file="src/test/resources/jbpm-destinations-service.xml" todir="${deploy.dir}"/>
+  	<copy file="jbpm-test-enterprise-ejb.jar" todir="${deploy.dir}"/> 
+  </target>
+  <target name="deploy-webapp">
+  	<copy todir="stagedir/WEB-INF/classes">
+  	  <fileset dir="target/test-classes"/>
+  	</copy>
+  	<war destfile="jbpm-test-enterprise-suite.war" basedir="stagedir"/>
+  	<copy file="jbpm-test-enterprise-suite.war" todir="${deploy.dir}"/>
+  </target>
+</project>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/build.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/pom.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -38,19 +38,82 @@
       <artifactId>cactus.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
 
+  <profiles>
+  
+    <profile>
+      <id>enterprise</id>
+      <properties>
+        <skipTests>true</skipTests>
+      </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>
+        </plugins>
+      </build>
+    </profile>
+    
+    <profile>
+      <id>runtest</id>
+      <dependencies>
+        <dependency>
+          <groupId>apache-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+          <version>3.1</version>
+        </dependency>
+		<dependency>
+		  <groupId>cactus</groupId>
+		  <artifactId>cactus.core</artifactId>
+		</dependency>
+		<dependency>
+		  <groupId>aspectj</groupId>
+		  <artifactId>aspectjrt</artifactId>
+		</dependency>
+      </dependencies>
+      <build>
+        <plugins>
+		      <plugin>
+		        <artifactId>maven-surefire-plugin</artifactId>
+		      </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+  </profiles>
+  
 </project>

Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/EjbTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/EjbTest.java	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/EjbTest.java	2009-12-10 04:36:26 UTC (rev 5938)
@@ -1,20 +0,0 @@
-package org.jbpm.test;
-
-import org.apache.cactus.ServletTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class EjbTest extends TestCase {
-	
-	public static Test suite() {
-		ServletTestSuite servletTestSuite = new ServletTestSuite();
-		servletTestSuite.addTestSuite(EjbTest.class);
-		return servletTestSuite;
-	}
-	
-	public void testEjbInvocation() {
-		throw new RuntimeException();
-	}
-
-}

Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/JmsTest.java
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/JmsTest.java	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/JmsTest.java	2009-12-10 04:36:26 UTC (rev 5938)
@@ -1,16 +0,0 @@
-package org.jbpm.test;
-
-import org.apache.cactus.ServletTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-public class JmsTest extends TestCase {
-
-	public static Test suite() {
-		ServletTestSuite servletTestSuite = new ServletTestSuite();
-		servletTestSuite.addTestSuite(JmsTest.class);
-		return servletTestSuite;
-	}
-
-}

Copied: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java (from rev 5934, jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/EjbTest.java)
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,26 @@
+package org.jbpm.test.ejb;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+import org.apache.cactus.ServletTestSuite;
+import org.jbpm.test.enterprise.stateless.bean.Calculator;
+
+public class EjbTest extends TestCase {
+	
+	public static Test suite() {
+		ServletTestSuite servletTestSuite = new ServletTestSuite();
+		servletTestSuite.addTestSuite(EjbTest.class);
+		return servletTestSuite;
+	}
+	
+	public void testEjbInvocation() throws Exception {
+		Context context = new InitialContext();
+		Calculator calculator = (Calculator)context.lookup("CalculatorBean/local");
+		assertEquals(59, calculator.add(24, 35));
+	}
+
+}


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Copied: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java (from rev 5934, jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/JmsTest.java)
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,16 @@
+package org.jbpm.test.jms;
+
+import org.apache.cactus.ServletTestSuite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+
+public class JmsTest extends TestCase {
+
+	public static Test suite() {
+		ServletTestSuite servletTestSuite = new ServletTestSuite();
+		servletTestSuite.addTestSuite(JmsTest.class);
+		return servletTestSuite;
+	}
+
+}


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/jms/JmsTest.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/cactus.properties	2009-12-10 04:36:26 UTC (rev 5938)
@@ -1 +1 @@
-cactus.contextURL=http://localhost:8080/jbpm-test-enterprise-suite
+cactus.contextURL=http://localhost:8080/jbpm-test-webapp

Deleted: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-destinations-service.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-destinations-service.xml	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-destinations-service.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-	<mbean code="org.jboss.jms.server.destination.QueueService"
-		name="jboss.messaging.destination:service=Queue,name=jbpm-test"
-		xmbean-dd="xmdesc/Queue-xmbean.xml">
-		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-		<depends>jboss.messaging:service=PostOffice</depends>
-	</mbean>
-</server>
\ No newline at end of file

Copied: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml (from rev 5934, jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-destinations-service.xml)
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+	<mbean code="org.jboss.jms.server.destination.QueueService"
+		name="jboss.messaging.destination:service=Queue,name=jbpm-test"
+		xmbean-dd="xmdesc/Queue-xmbean.xml">
+		<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+		<depends>jboss.messaging:service=PostOffice</depends>
+	</mbean>
+</server>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="EJB" xmlns="http://jbpm.org/4.3/jpdl">
+
+  <start g="20,20,48,48">
+    <transition to="calculate" />
+  </start>
+
+  <ejb name="calculate" 
+        jndi="CalculatorBean"
+        method="add"
+        var="answer"
+        g="96,16,83,52">
+        
+    <arg><int value="25"/></arg>
+    <arg><int value="38"/></arg>
+    
+    <transition to="wait" />
+  </java>
+  
+  <state name="wait" g="352,17,88,52"/>
+
+</process>


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="JMS map" xmlns="http://jbpm.org/4.3/jpdl">
+
+  <start g="20,20,48,48">
+    <transition to="send message" />
+  </start>
+
+  <jms name="send message" 
+        connectionFactory="ConnectionFactory"
+        destination="queue/test-jbpm"
+        g="96,16,83,52">
+    <message type="map">
+      <entry name="x" value="foo"/>
+      <entry name="y" value="bar"/>
+    </message>    
+    <transition to="wait" />
+  </java>
+  
+  <state name="wait" g="352,17,88,52"/>
+
+</process>


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="JMS object" xmlns="http://jbpm.org/4.3/jpdl">
+
+  <start g="20,20,48,48">
+    <transition to="send message" />
+  </start>
+
+  <jms name="send message" 
+        connectionFactory="ConnectionFactory"
+        destination="queue/test-jbpm"
+        g="96,16,83,52">
+    <message type="object">
+      ${object}
+    </message>    
+    <transition to="wait" />
+  </java>
+  
+  <state name="wait" g="352,17,88,52"/>
+
+</process>


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml	                        (rev 0)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="JMS text" xmlns="http://jbpm.org/4.3/jpdl">
+
+  <start g="20,20,48,48">
+    <transition to="send message" />
+  </start>
+
+  <jms name="send message" 
+        connectionFactory="ConnectionFactory"
+        destination="queue/test-jbpm"
+        g="96,16,83,52">
+    <message type="text">
+      This is the body
+    </message>    
+    <transition to="wait" />
+  </java>
+  
+  <state name="wait" g="352,17,88,52"/>
+
+</process>


Property changes on: jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/qa/build.xml	2009-12-10 04:36:26 UTC (rev 5938)
@@ -176,8 +176,8 @@
     <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="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" />
-    <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war">
+    <mkdir dir="${jboss.home}/server/default/deploy/jbpm-test/jbpm-test-webapp.war" />
+    <copy todir="${jboss.home}/server/default/deploy/jbpm-test/jbpm-test-webapp.war">
       <fileset dir="${jbpm.home}/install/generated/user-webapp"/>
     </copy>
 
@@ -187,30 +187,38 @@
     </copy>
 
     <!-- customize the configuration for the jbpm-test-webapp -->
-    <copy todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war" overwrite="true">
+    <copy todir="${jboss.home}/server/default/deploy/jbpm-test/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/jbpm-test-webapp.war/WEB-INF/classes" />
+    <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" 
-    	    todir="${jboss.home}/server/default/deploy/jbpm-test-webapp.war/WEB-INF/lib" />
+    	    todir="${jboss.home}/server/default/deploy/jbpm-test/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" />
+    	    todir="${jboss.home}/server/default/deploy/jbpm-test/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 todir="${jboss.home}/server/default/deploy/jbpm-test/jbpm-test-webapp.war/WEB-INF/lib">
+      <fileset dir="../modules/test-enterprise/test-enterprise-suite/target/jbpm.test.webapp.libs" />
     </copy>
+  	
+  	<!-- create the test queue -->
+  	<copy file="../modules/test-enterprise/test-enterprise-suite/src/test/resources/jbpm-test-destinations-service.xml"
+  	    todir="${jboss.home}/server/default/deploy/jbpm-test" />
+  	
+  	<!-- deploy the test ejbs -->
+  	<copy file="../modules/test-enterprise/test-enterprise-ejb/target/jbpm-test-enterprise-ejb-${jbpm.version}.jar" 
+  		todir="${jboss.home}/server/default/deploy/jbpm-test"/>
 
-    <!-- start jboss
+    <!-- start jboss -->
     <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" />
-    -->
+
   </target>
     
 

Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-10 04:36:26 UTC (rev 5938)
@@ -8,7 +8,7 @@
 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   cd modules/test-enterprise/test-enterprise-suite
 rem   mvn -Pruntest test
 rem   cd ../..
 

Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh	2009-12-10 02:22:31 UTC (rev 5937)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.sh	2009-12-10 04:36:26 UTC (rev 5938)
@@ -6,15 +6,11 @@
 ANT_PROPERTIES="-Djboss.version=$JBOSS_VERSION -Djbpm.parent.dir=$WORKSPACE -Djboss.distro.dir=$SOURCE_REPO/jboss"
 echo ANT_PROPERTIES=${ANT_PROPERTIES}
 
-#echo just in case the previous run didnt complete ok, we stop jboss
-#ant -f modules/distro/src/main/files/install/build.xml $ANT_PROPERTIES reinstall.jboss
-#ant -f modules/distro/src/main/files/install/build.xml $ANT_PROPERTIES stop.jboss
-
-mvn -U -Pdistro,integration clean install
+mvn -U -Pdistro,enterprise clean install
 ant -f qa/build.xml $ANT_PROPERTIES testsuite.enterprise.setup
 
-cd modules/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



More information about the jbpm-commits mailing list