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

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Dec 18 11:52:35 EST 2009


Author: tom.baeyens at jboss.com
Date: 2009-12-18 11:52:34 -0500 (Fri, 18 Dec 2009)
New Revision: 5996

Modified:
   jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
   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/resources/org/jbpm/test/ejb/process.jpdl.xml
   jbpm4/trunk/qa/build.xml
   jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
Log:
JBPM-2300 JBPM-2412 enterprise test fixes

Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd	2009-12-18 16:52:34 UTC (rev 5996)
@@ -959,6 +959,10 @@
       <annotation><documentation>The name of the method to invoke.
       </documentation></annotation>
     </attribute>
+    <attribute name="ejb-jndi-name" type="string">
+      <annotation><documentation>The jndi name of the ejb that needs to be invoked.
+      </documentation></annotation>
+    </attribute>
     <attribute name="class" type="string">
       <annotation><documentation>The class to instantiate.
       </documentation></annotation>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2009-12-18 16:52:34 UTC (rev 5996)
@@ -229,7 +229,7 @@
         <include name="antlr.jar" />
         <include name="antlr-runtime.jar" />
         <include name="commons-collections.jar" />
-        <include name="core.jar" />
+        <!-- include name="core.jar" /-->
         <include name="dom4j.jar" />
         <include name="drools-api.jar" />
         <include name="drools-core.jar" />
@@ -323,7 +323,7 @@
       </fileset>
       <fileset dir="${jbpm.home}/lib">
         <include name="antlr-runtime.jar" />
-        <include name="core.jar" />
+        <!-- include name="core.jar" /-->
         <include name="drools-api.jar" />
         <include name="drools-core.jar" />
         <include name="drools-compiler.jar" />
@@ -486,7 +486,7 @@
         <include name="bsh.jar" />
         <include name="commons-collections.jar" />
         <include name="commons-logging.jar" />
-        <include name="core.jar" />
+        <!-- include name="core.jar" /-->
         <include name="dom4j.jar" />
         <include name="drools-api.jar" />
         <include name="drools-core.jar" />

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java	2009-12-18 16:52:34 UTC (rev 5996)
@@ -48,7 +48,7 @@
   public Object parseJpdl(Element element, Parse parse, JpdlParser parser) {
     JavaActivity javaActivity = new JavaActivity();
     if (XmlUtil.attribute(element, "method", true, parse, null)!=null) {      
-      String jndiName = XmlUtil.attribute(element, "jndi-name", false, parse, null); 
+      String jndiName = XmlUtil.attribute(element, "ejb-jndi-name", false, parse, null); 
       if (jndiName != null) {
         parseEjbInvocation(javaActivity, element, parse, parser);
       } else {
@@ -61,7 +61,7 @@
   }
   
   private void parseEjbInvocation(JavaActivity javaActivity, Element element, Parse parse, JpdlParser parser) {
-    javaActivity.setJndiName(XmlUtil.attribute(element, "jndi-name"));
+    javaActivity.setJndiName(XmlUtil.attribute(element, "ejb-jndi-name"));
     javaActivity.setMethodName(XmlUtil.attribute(element, "method"));
     List<Element> argElements = XmlUtil.elements(element, "arg");
     List<ArgDescriptor> argDescriptors = new WireParser().parseArgs(argElements, parse);

Modified: 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/ejb/EjbTest.java	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/java/org/jbpm/test/ejb/EjbTest.java	2009-12-18 16:52:34 UTC (rev 5996)
@@ -25,6 +25,6 @@
         .startProcessInstanceByKey("EJB")
         .getProcessInstance()
         .getId();
-    assertEquals(59, executionService.getVariable(executionId, "answer"));
+    assertEquals(63, executionService.getVariable(executionId, "answer"));
   }
 }

Modified: 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	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/ejb/process.jpdl.xml	2009-12-18 16:52:34 UTC (rev 5996)
@@ -7,7 +7,7 @@
   </start>
 
   <java name="calculate" 
-        jndi="CalculatorBean"
+        ejb-jndi-name="CalculatorBean/local"
         method="add"
         var="answer"
         g="96,16,83,52">

Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/qa/build.xml	2009-12-18 16:52:34 UTC (rev 5996)
@@ -44,7 +44,7 @@
 
 
   <!-- ####################################### -->
-    <!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
+  <!-- ### MAIN SETUP AND TEARDOWN TARGETS ### -->
   <!-- ####################################### -->
     
   <!-- DB SETUP -->
@@ -61,15 +61,15 @@
 
   <!-- 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="install.hsqldb.server" />
     <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" />
     <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"/>
     </copy>
@@ -79,14 +79,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>
@@ -96,7 +96,7 @@
 
     <!-- start tomcat -->
     <ant antfile="${jbpm.home}/install/build.xml" target="start.tomcat" />
-    </target>
+  </target>
 
   <!-- TOMCAT TEARDOWN -->
   <target name="testsuite.tomcat.teardown">
@@ -104,7 +104,7 @@
     <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" />
     <ant antfile="${jbpm.home}/install/build.xml" target="stop.hsqldb.server" />
   </target>
-	
+  
   <!-- JBOSS SETUP -->
   <target name="testsuite.jboss.setup" 
           depends="jboss.test.setup.base"
@@ -139,17 +139,24 @@
   <target name="testsuite.enterprise.setup" 
           depends="jboss.test.setup.base"
           description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
-  	
-  	<!-- 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"/>
+    
+    <!-- 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 
-    <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" /> -->
+    <!-- copy the test classes to the test web app  -->
+    <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-webapp.war/WEB-INF/lib" />
+
+    <!-- start hsqldb -->
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.hsqldb.server" />
+    <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" />
+    <!-- start jboss -->
+    <ant antfile="${jbpm.home}/install/build.xml" target="start.jboss" />
   </target>
 
   <!-- ENTERPRISE TEARDOWN -->
@@ -303,7 +310,7 @@
   <!-- ### These targets can be called directly ### -->
   <!-- ############################################ -->
 
-	<!-- re-install jbpm and setup jboss for cactus testing  --> 
+  <!-- re-install jbpm and setup jboss for cactus testing  --> 
   <target name="jboss.test.setup.base" 
           depends="reinstall.jbpm">
     <ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" />

Modified: jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-18 16:15:40 UTC (rev 5995)
+++ jbpm4/trunk/qa/hudson-jbpm4-enterprise.bat	2009-12-18 16:52:34 UTC (rev 5996)
@@ -13,3 +13,5 @@
 cd ..\..\..
 
 cmd /C ant -f qa/build.xml %ANT_PROPERTIES% testsuite.enterprise.teardown
+
+echo 



More information about the jbpm-commits mailing list