[jbpm-commits] JBoss JBPM SVN: r1666 - in jbpm3/trunk: modules/jpdl/core and 8 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-07-17 05:54:14 -0400 (Thu, 17 Jul 2008)
New Revision: 1666

Added:
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jpdl32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jpdl32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/parallel-split-jpdl32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jpdl32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jpdl32.xml
Removed:
   jbpm3/trunk/modules/jpdl/core/src/main/java/org/jbpm/integration/
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jbpm32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jbpm32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml
   jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jbpm32.xml
Modified:
   jbpm3/trunk/modules/jpdl/core/pom.xml
   jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml
   jbpm3/trunk/pom.xml
Log:
Use API provided jpdl32 handler

Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -30,15 +30,9 @@
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
       <artifactId>jbpm-api</artifactId>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
-      <artifactId>jbpm-api-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.jbpm</groupId>
       <artifactId>jbpm-api-testsuite</artifactId>
       <type>zip</type>
     </dependency>
@@ -116,6 +110,18 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
+    
+    <!-- Runtime Dependencies -->
+    <dependency>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-api-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-api-dialect-jpdl32</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
   
   <!-- Plugins -->
@@ -219,7 +225,7 @@
           <systemProperties>
             <property>
               <name>jbpm.dialect</name>
-              <value>jbpm32</value>
+              <value>jpdl32</value>
             </property>
             <property>
               <name>log4j.output.dir</name>

Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/jbpm-beans.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -14,9 +14,15 @@
   <bean name="jBPMProcessBuilderFactory" class="org.jboss.bpm.model.internal.ProcessBuilderFactoryImpl"/>
   
   <!-- The ProcessManager -->
-  <bean name="jBPMProcessManager" class="org.jbpm.integration.client.ProcessManagerImpl">
+  <bean name="jBPMProcessManager" class="org.jboss.bpm.client.internal.ProcessManagerImpl">
     <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property>
+    <property name="dialectHandlers">
+      <map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
+        <entry><key>jpdl32</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry>
+      </map>
+    </property>
   </bean>
+  <bean name="jBPMDialectHandlerJPDL32" class="org.jboss.bpm.dialect.jpdl32.DialectHandlerImpl"/>
 
   <!-- The ExecutionManager -->
   <bean name="jBPMExecutionManager" class="org.jboss.bpm.client.internal.ExecutionManagerImpl">

Deleted: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jbpm32.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jbpm32.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jbpm32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-context'>
-  <start-state>
-    <transition to='stateA' />
-  </start-state>
-  <state name='stateA'>
-    <event type='node-enter'>
-      <action class='org.jboss.bpm.samples.context.TaskA' />
-    </event>
-    <transition to='end' />
-  </state>
-  <end-state name='end' />
-</process-definition>
\ No newline at end of file

Copied: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jpdl32.xml (from rev 1663, jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jbpm32.xml)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jpdl32.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/context/basic-context-jpdl32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -0,0 +1,12 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-context'>
+  <start-state>
+    <transition to='stateA' />
+  </start-state>
+  <state name='stateA'>
+    <event type='node-enter'>
+      <action class='org.jboss.bpm.samples.context.TaskA' />
+    </event>
+    <transition to='end' />
+  </state>
+  <end-state name='end' />
+</process-definition>
\ No newline at end of file

Deleted: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jbpm32.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jbpm32.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jbpm32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -1,9 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-engine'>
-  <start-state>
-    <transition to='stateA' />
-  </start-state>
-  <state name='stateA'>
-    <transition to='end' />
-  </state>
-  <end-state name='end' />
-</process-definition>
\ No newline at end of file

Copied: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jpdl32.xml (from rev 1663, jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jbpm32.xml)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jpdl32.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/engine/basic-engine-jpdl32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -0,0 +1,9 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-engine'>
+  <start-state>
+    <transition to='stateA' />
+  </start-state>
+  <state name='stateA'>
+    <transition to='end' />
+  </state>
+  <end-state name='end' />
+</process-definition>
\ No newline at end of file

Added: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/parallel-split-jpdl32.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/parallel-split-jpdl32.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/parallel-split-jpdl32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -0,0 +1,11 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='testParallelSplit'>
+  <start-state>
+    <transition to='gateway' />
+  </start-state>
+  <fork name='gateway'>
+    <transition to='endA' />
+    <transition to='endB' />
+  </fork>
+  <end-state name='endA' />
+  <end-state name='endB' />
+</process-definition>


Property changes on: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/parallelsplit/parallel-split-jpdl32.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -1,9 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='testBasicSequence'>
-  <start-state>
-    <transition to='stateA' />
-  </start-state>
-  <state name='stateA'>
-    <transition to='end' />
-  </state>
-  <end-state name='end' />
-</process-definition>
\ No newline at end of file

Copied: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jpdl32.xml (from rev 1663, jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jpdl32.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/sequence/basic-sequence-jpdl32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -0,0 +1,9 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='testBasicSequence'>
+  <start-state>
+    <transition to='stateA' />
+  </start-state>
+  <state name='stateA'>
+    <transition to='end' />
+  </state>
+  <end-state name='end' />
+</process-definition>
\ No newline at end of file

Deleted: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jbpm32.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jbpm32.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jbpm32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -1,12 +0,0 @@
-<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='testBasicTask'>
-  <start-state>
-    <transition to='stateA' />
-  </start-state>
-  <state name='stateA'>
-    <event type='node-enter'>
-      <action class='org.jboss.bpm.samples.task.TaskA' />
-    </event>
-    <transition to='end' />
-  </state>
-  <end-state name='end' />
-</process-definition>
\ No newline at end of file

Copied: jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jpdl32.xml (from rev 1663, jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jbpm32.xml)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jpdl32.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/test/resources/samples/task/basic-task-jpdl32.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -0,0 +1,12 @@
+<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='testBasicTask'>
+  <start-state>
+    <transition to='stateA' />
+  </start-state>
+  <state name='stateA'>
+    <event type='node-enter'>
+      <action class='org.jboss.bpm.samples.task.TaskA' />
+    </event>
+    <transition to='end' />
+  </state>
+  <end-state name='end' />
+</process-definition>
\ No newline at end of file

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-07-17 09:53:58 UTC (rev 1665)
+++ jbpm3/trunk/pom.xml	2008-07-17 09:54:14 UTC (rev 1666)
@@ -95,6 +95,11 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.jbpm</groupId>
+        <artifactId>jbpm-api-dialect-jpdl32</artifactId>
+        <version>${jboss.jbpm.api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.jbpm</groupId>
         <artifactId>jbpm-api-testsuite</artifactId>
         <version>${jboss.jbpm.api.version}</version>
         <type>zip</type>