11:53 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-07-17 05:53:58 -0400 (Thu, 17 Jul 2008)
New Revision: 1665
Modified:
api/trunk/modules/api/pom.xml
api/trunk/modules/dialects/api10/pom.xml
api/trunk/modules/dialects/jpdl32/pom.xml
api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
api/trunk/modules/testsuite/pom.xml
Log:
Use API provided jpdl32 handler
Modified: api/trunk/modules/api/pom.xml
===================================================================
--- api/trunk/modules/api/pom.xml 2008-07-17 09:30:00 UTC (rev 1664)
+++ api/trunk/modules/api/pom.xml 2008-07-17 09:53:58 UTC (rev 1665)
@@ -30,10 +30,6 @@
<!-- Compile Dependencies -->
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
@@ -49,12 +45,6 @@
<scope>provided</scope>
</dependency>
- <!-- Runtime/System Dependencies -->
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<!-- Plugins -->
Modified: api/trunk/modules/dialects/api10/pom.xml
===================================================================
--- api/trunk/modules/dialects/api10/pom.xml 2008-07-17 09:30:00 UTC (rev 1664)
+++ api/trunk/modules/dialects/api10/pom.xml 2008-07-17 09:53:58 UTC (rev 1665)
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM - API Dialect API-1.0</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-api-dialect-jaxb</artifactId>
+ <artifactId>jbpm-api-dialect-api10</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
@@ -33,6 +33,15 @@
<version>${version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: api/trunk/modules/dialects/jpdl32/pom.xml
===================================================================
--- api/trunk/modules/dialects/jpdl32/pom.xml 2008-07-17 09:30:00 UTC (rev 1664)
+++ api/trunk/modules/dialects/jpdl32/pom.xml 2008-07-17 09:53:58 UTC (rev 1665)
@@ -33,6 +33,15 @@
<version>${version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java
===================================================================
---
api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-07-17
09:30:00 UTC (rev 1664)
+++
api/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-07-17
09:53:58 UTC (rev 1665)
@@ -29,6 +29,7 @@
import org.jboss.bpm.dialect.jpdl32.model.JPDL32Action;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32EndState;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32Event;
+import org.jboss.bpm.dialect.jpdl32.model.JPDL32Fork;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32StartState;
import org.jboss.bpm.dialect.jpdl32.model.JPDL32State;
@@ -59,6 +60,10 @@
{
adaptState(builder, (JPDL32State)jpdlObj);
}
+ else if (jpdlObj instanceof JPDL32Fork)
+ {
+ adaptFork(builder, (JPDL32Fork)jpdlObj);
+ }
else if (jpdlObj instanceof JPDL32EndState)
{
adaptEndState(builder, (JPDL32EndState)jpdlObj);
@@ -113,6 +118,12 @@
}
}
+ private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj)
+ {
+ builder.addParallelGateway(jpdlObj.getName());
+ adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent());
+ }
+
private void adaptTransitions(ProcessBuilder builder, List<Object> list)
{
for (Object subEl : list)
Modified: api/trunk/modules/testsuite/pom.xml
===================================================================
--- api/trunk/modules/testsuite/pom.xml 2008-07-17 09:30:00 UTC (rev 1664)
+++ api/trunk/modules/testsuite/pom.xml 2008-07-17 09:53:58 UTC (rev 1665)
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-api-dialect-jaxb</artifactId>
+ <artifactId>jbpm-api-dialect-api10</artifactId>
<version>${version}</version>
<scope>runtime</scope>
</dependency>