[jbpm-commits] JBoss JBPM SVN: r1606 - in api/trunk/modules: api/src/main/java/org/jboss/bpm/model and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-07-13 11:46:20 -0400 (Sun, 13 Jul 2008) New Revision: 1606 Added: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml Removed: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java api/trunk/modules/testsuite/pom.xml api/trunk/modules/testsuite/scripts/assembly-testsuite.xml api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java Log: Provide API1.0 dialect for tests Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -166,7 +166,7 @@ { try { - File file = new File("target/" + proc.getName() + ".xml").getCanonicalFile(); + File file = new File("target/" + proc.getName() + "-api10.xml").getCanonicalFile(); log.debug("Generate: " + file); FileWriter writer = new FileWriter(file); Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/ExecutionHandler.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -23,7 +23,6 @@ //$Id$ -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.jboss.bpm.runtime.Token; @@ -35,9 +34,8 @@ * @since 08-Jul-2008 */ @XmlType(name = "ExecutionHandler") -public abstract class ExecutionHandler extends Handler +public class ExecutionHandler extends Handler { - @XmlTransient private ExecutionHandler delegate; /** Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowHandler.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -34,7 +34,7 @@ * @since 08-Jul-2008 */ @XmlType(name = "FlowHandler") -public abstract class FlowHandler extends Handler +public class FlowHandler extends Handler { private FlowHandler delegate; Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Handler.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -23,11 +23,12 @@ //$Id$ -import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import org.jboss.bpm.NotImplementedException; + /** * Implement to handle the outgoing Flows for an FlowObject * @@ -37,11 +38,31 @@ @XmlType(name = "Handler") public abstract class Handler { - @XmlElement(name = "class") private String className; - @XmlElement(name = "bean") private String beanRef; + public String getClassName() + { + return className; + } + + @XmlAttribute(name = "class", required = false) + public void setClassName(String className) + { + this.className = className; + } + + public String getBeanRef() + { + return beanRef; + } + + @XmlAttribute(name = "bean", required = false) + public void setBeanRef(String beanRef) + { + this.beanRef = beanRef; + } + @SuppressWarnings("unchecked") protected <T> T newInstance(Class<T> clazz) { Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/SignalHandler.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -33,7 +33,7 @@ * @since 08-Jul-2008 */ @XmlType(name = "SignalHandler") -public abstract class SignalHandler extends Handler +public class SignalHandler extends Handler { private SignalHandler delegate; Modified: api/trunk/modules/testsuite/pom.xml =================================================================== --- api/trunk/modules/testsuite/pom.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/pom.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -90,6 +90,21 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>jbpm.dialect</name> + <value>api10</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </build> @@ -126,6 +141,10 @@ <name>jbpm.dialect</name> <value>jbpm32</value> </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> </systemProperties> </configuration> </plugin> Modified: api/trunk/modules/testsuite/scripts/assembly-testsuite.xml =================================================================== --- api/trunk/modules/testsuite/scripts/assembly-testsuite.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/scripts/assembly-testsuite.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -9,6 +9,9 @@ <fileSet> <directory>src/test</directory> <outputDirectory>/</outputDirectory> + <excludes> + <exclude>resources/jbpm-beans.xml</exclude> + </excludes> </fileSet> </fileSets> </assembly> \ No newline at end of file Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java =================================================================== --- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/engine/EngineShutdownTest.java 2008-07-13 15:46:20 UTC (rev 1606) @@ -47,7 +47,7 @@ protected void setUp() throws Exception { super.setUp(); - jpdlURL = getResourceURL("samples/engine/basic-engine.xml"); + jpdlURL = getResourceURL("samples/engine/basic-engine-" + getDialect() + ".xml"); engine = ProcessEngineLocator.locateProcessEngine(); engine.cancelShutdown(); } Copied: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml) =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml (rev 0) +++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-api10.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -0,0 +1,10 @@ +<ns2:process name="basic-context" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1"> + <start> + <sequence to="stateA" /> + </start> + <task name="stateA"> + <sequence to="end" /> + <execution-handler class="org.jboss.bpm.samples.context.TaskA" /> + </task> + <end name="end" /> +</ns2:process> \ No newline at end of file Deleted: api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/src/test/resources/samples/context/basic-context-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -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: api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml (from rev 1598, api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml) =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml (rev 0) +++ api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine-api10.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -0,0 +1,9 @@ +<ns2:process name="basic-engine" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1"> + <start> + <sequence to="stateA" /> + </start> + <task name="stateA"> + <sequence to="end" /> + </task> + <end name="end" /> +</ns2:process> \ No newline at end of file Deleted: api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/src/test/resources/samples/engine/basic-engine.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -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: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml) =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml (rev 0) +++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-api10.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -0,0 +1,9 @@ +<ns2:process name="basic-sequence" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1"> + <start> + <sequence to="stateA" /> + </start> + <task name="stateA"> + <sequence to="end" /> + </task> + <end name="end" /> +</ns2:process> \ No newline at end of file Deleted: api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/src/test/resources/samples/sequence/basic-sequence-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -1,9 +0,0 @@ -<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-sequence'> - <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: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml (from rev 1602, api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml) =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml (rev 0) +++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-api10.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -0,0 +1,10 @@ +<ns2:process name="basic-task" xmlns:ns2="urn:api.bpm.jboss:jpdl-0.1"> + <start> + <sequence to="stateA" /> + </start> + <task name="stateA"> + <sequence to="end" /> + <execution-handler class="org.jboss.bpm.samples.task.TaskA" /> + </task> + <end name="end" /> +</ns2:process> \ No newline at end of file Deleted: api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml =================================================================== --- api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml 2008-07-13 14:59:38 UTC (rev 1605) +++ api/trunk/modules/testsuite/src/test/resources/samples/task/basic-task-jbpm32.xml 2008-07-13 15:46:20 UTC (rev 1606) @@ -1,12 +0,0 @@ -<process-definition xmlns='urn:jbpm.org:jpdl-3.2' name='basic-task'> - <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