[jbpm-commits] JBoss JBPM SVN: r1987 - in jbossbpm/spec/trunk: docs/VioletUML and 26 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-08-22 14:56:09 -0400 (Fri, 22 Aug 2008) New Revision: 1987 Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml Removed: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java Modified: jbossbpm/spec/trunk/docs/VioletUML/APIExecution.png jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java jbossbpm/spec/trunk/modules/testsuite/pom.xml jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.png jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml jbossbpm/spec/trunk/pom.xml Log: Add more descriptor tests Modified: jbossbpm/spec/trunk/docs/VioletUML/APIExecution.png =================================================================== (Binary files differ) Modified: jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet =================================================================== --- jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/docs/VioletUML/APIExecution.seq.violet 2008-08-22 18:56:09 UTC (rev 1987) @@ -11,7 +11,7 @@ </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>37.0</double> + <double>8.0</double> <double>0.0</double> </void> </object> @@ -36,24 +36,11 @@ <void method="addChild"> <object id="ActivationBarNode3" class="com.horstmann.violet.CallNode"> <void property="implicitParameter"> - <object idref="LifelineNode1"/> - </void> - </object> - </void> - <void method="addChild"> - <object id="ActivationBarNode4" class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> - <object idref="LifelineNode1"/> - </void> - </object> - </void> - <void method="addChild"> - <object id="ActivationBarNode5" class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> <object id="LifelineNode2" class="com.horstmann.violet.ImplicitParameterNode"> <void property="name"> <void property="text"> - <string>Flow + <string>Token +Executor </string> </void> </void> @@ -62,12 +49,13 @@ </object> </void> <void method="addChild"> - <object id="ActivationBarNode6" class="com.horstmann.violet.CallNode"> + <object id="ActivationBarNode4" class="com.horstmann.violet.CallNode"> <void property="implicitParameter"> <object id="LifelineNode3" class="com.horstmann.violet.ImplicitParameterNode"> <void property="name"> <void property="text"> - <string>FlowObject</string> + <string>Runnable +Process</string> </void> </void> </object> @@ -75,65 +63,112 @@ </object> </void> <void method="addChild"> - <object id="ActivationBarNode7" class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> - <object id="LifelineNode4" class="com.horstmann.violet.ImplicitParameterNode"> - <void property="name"> - <void property="text"> - <string>Execution + <object id="ActivationBarNode5" class="com.horstmann.violet.CallNode"> + <void method="addChild"> + <object id="ActivationBarNode6" class="com.horstmann.violet.CallNode"> + <void method="addChild"> + <object id="ActivationBarNode7" class="com.horstmann.violet.CallNode"> + <void property="implicitParameter"> + <object id="LifelineNode4" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Sequence +Flow</string> + </void> + </void> + </object> + </void> + </object> + </void> + <void method="addChild"> + <object id="ActivationBarNode8" class="com.horstmann.violet.CallNode"> + <void property="implicitParameter"> + <object id="LifelineNode5" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Signal Handler</string> - </void> + </void> + </void> + </object> + </void> + </object> </void> + <void method="addChild"> + <object id="ActivationBarNode9" class="com.horstmann.violet.CallNode"> + <void property="implicitParameter"> + <object id="LifelineNode6" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Execution +Handler</string> + </void> + </void> + </object> + </void> + </object> + </void> + <void method="addChild"> + <object id="ActivationBarNode10" class="com.horstmann.violet.CallNode"> + <void property="implicitParameter"> + <object id="LifelineNode7" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Flow +Handler</string> + </void> + </void> + </object> + </void> + </object> + </void> + <void property="implicitParameter"> + <object id="LifelineNode8" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Runnable +Token</string> + </void> + </void> + </object> + </void> </object> </void> + <void property="implicitParameter"> + <object idref="LifelineNode2"/> + </void> </object> </void> - <void method="addChild"> - <object id="ActivationBarNode8" class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> - <object idref="LifelineNode3"/> + <void property="implicitParameter"> + <object id="LifelineNode9" class="com.horstmann.violet.ImplicitParameterNode"> + <void property="name"> + <void property="text"> + <string>Execution +Manager</string> + </void> </void> </object> </void> + </object> + </void> + <void method="addChild"> + <object id="ActivationBarNode11" class="com.horstmann.violet.CallNode"> <void method="addChild"> - <object id="ActivationBarNode9" class="com.horstmann.violet.CallNode"> + <object id="ActivationBarNode12" class="com.horstmann.violet.CallNode"> <void method="addChild"> - <object id="ActivationBarNode10" class="com.horstmann.violet.CallNode"> + <object id="ActivationBarNode13" class="com.horstmann.violet.CallNode"> <void property="implicitParameter"> - <object idref="LifelineNode1"/> + <object idref="LifelineNode8"/> </void> </object> </void> <void property="implicitParameter"> - <object id="LifelineNode5" class="com.horstmann.violet.ImplicitParameterNode"> - <void property="name"> - <void property="text"> - <string>FlowHandler</string> - </void> - </void> - </object> + <object idref="LifelineNode3"/> </void> </object> </void> - <void method="addChild"> - <object id="ActivationBarNode11" class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> - <object idref="LifelineNode1"/> - </void> - <void property="openBottom"> - <boolean>true</boolean> - </void> - </object> - </void> <void property="implicitParameter"> - <object id="LifelineNode6" class="com.horstmann.violet.ImplicitParameterNode"> - <void property="name"> - <void property="text"> - <string>Execution -Manager</string> - </void> - </void> - </object> + <object idref="LifelineNode9"/> </void> <void property="openBottom"> <boolean>true</boolean> @@ -146,193 +181,229 @@ </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>69.0</double> + <double>40.0</double> <double>80.0</double> </void> </object> </void> <void method="addNode"> - <object idref="LifelineNode6"/> + <object idref="LifelineNode9"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>230.0</double> + <double>100.0</double> <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="LifelineNode3"/> + <object idref="LifelineNode7"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>561.0</double> + <double>945.0</double> <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="LifelineNode5"/> + <object idref="LifelineNode1"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>782.0</double> + <double>198.0</double> <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="LifelineNode1"/> + <object idref="ActivationBarNode1"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>343.0</double> - <double>0.0</double> + <double>132.0</double> + <double>103.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode1"/> + <object id="NoteNode0" class="com.horstmann.violet.NoteNode"> + <void property="text"> + <void property="text"> + <string>The FlowHandler calls +create, start, move, suspend, +activate, destroy on the +TokenExecutor</string> + </void> + </void> + </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>262.0</double> - <double>103.0</double> + <double>752.0</double> + <double>545.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode4"/> + <object id="PointNode0" class="com.horstmann.violet.PointNode"> + <void id="Rectangle2D$Double0" property="bounds"> + <void method="setRect"> + <double>983.0</double> + <double>509.0</double> + <double>0.0</double> + <double>0.0</double> + </void> + </void> + <void property="bounds"> + <object idref="Rectangle2D$Double0"/> + </void> + </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>375.0</double> - <double>232.0</double> + <double>983.0</double> + <double>509.0</double> </void> </object> </void> <void method="addNode"> - <object idref="LifelineNode2"/> + <object id="PointNode1" class="com.horstmann.violet.PointNode"> + <void id="Rectangle2D$Double1" property="bounds"> + <void method="setRect"> + <double>550.0</double> + <double>420.0</double> + <double>0.0</double> + <double>0.0</double> + </void> + </void> + <void property="bounds"> + <object idref="Rectangle2D$Double1"/> + </void> + </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>455.0</double> - <double>0.0</double> + <double>550.0</double> + <double>420.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode5"/> + <object id="NoteNode1" class="com.horstmann.violet.NoteNode"> + <void property="text"> + <void property="text"> + <string>The RunnableToken thread +ends when destroy is called +on the TokenExecutor</string> + </void> + </void> + </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>487.0</double> - <double>285.0</double> + <double>349.0</double> + <double>476.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode8"/> + <object idref="LifelineNode6"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>593.0</double> - <double>444.0</double> + <double>846.0</double> + <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode9"/> + <object idref="ActivationBarNode2"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>814.0</double> - <double>497.0</double> + <double>230.0</double> + <double>126.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode10"/> + <object idref="LifelineNode2"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>375.0</double> - <double>520.0</double> + <double>293.0</double> + <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode11"/> + <object idref="ActivationBarNode3"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>375.0</double> - <double>593.0</double> + <double>325.0</double> + <double>179.0</double> </void> </object> </void> <void method="addNode"> - <object id="NoteNode0" class="com.horstmann.violet.NoteNode"> - <void property="text"> - <void property="text"> - <string>The FlowHandler adds all -active outgoing Flows to the -FlowQueue in the Token</string> - </void> + <object idref="LifelineNode3"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>400.0</double> + <double>0.0</double> </void> </object> + </void> + <void method="addNode"> + <object idref="ActivationBarNode5"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>831.0</double> - <double>352.0</double> + <double>325.0</double> + <double>285.0</double> </void> </object> </void> <void method="addNode"> - <object id="PointNode0" class="com.horstmann.violet.PointNode"> - <void id="Rectangle2D$Double0" property="bounds"> - <void method="setRect"> - <double>822.0</double> - <double>521.0</double> - <double>0.0</double> - <double>0.0</double> - </void> + <object idref="LifelineNode5"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>753.0</double> + <double>0.0</double> </void> - <void property="bounds"> - <object idref="Rectangle2D$Double0"/> - </void> </object> + </void> + <void method="addNode"> + <object idref="LifelineNode8"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>822.0</double> - <double>521.0</double> + <double>511.0</double> + <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object id="PointNode1" class="com.horstmann.violet.PointNode"> - <void id="Rectangle2D$Double1" property="bounds"> - <void method="setRect"> - <double>270.0</double> - <double>593.0</double> - <double>0.0</double> - <double>0.0</double> - </void> + <object idref="ActivationBarNode6"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>543.0</double> + <double>308.0</double> </void> - <void property="bounds"> - <object idref="Rectangle2D$Double1"/> - </void> </object> + </void> + <void method="addNode"> + <object idref="ActivationBarNode8"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>270.0</double> - <double>593.0</double> + <double>785.0</double> + <double>384.0</double> </void> </object> </void> <void method="addNode"> - <object id="NoteNode1" class="com.horstmann.violet.NoteNode"> - <void property="text"> - <void property="text"> - <string>The ExecutionManager -executes Flows while -there are any in the -FlowQueue.</string> - </void> + <object idref="ActivationBarNode9"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>878.0</double> + <double>437.0</double> </void> </object> + </void> + <void method="addNode"> + <object idref="ActivationBarNode10"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>96.0</double> - <double>429.0</double> + <double>977.0</double> + <double>490.0</double> </void> </object> </void> @@ -340,60 +411,94 @@ <object idref="LifelineNode4"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>670.0</double> + <double>637.0</double> <double>0.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode7"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>593.0</double> - <double>338.0</double> + <double>669.0</double> + <double>331.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode7"/> + <object idref="ActivationBarNode11"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>702.0</double> - <double>391.0</double> + <double>132.0</double> + <double>603.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode2"/> + <object id="NoteNode2" class="com.horstmann.violet.NoteNode"> + <void property="text"> + <void property="text"> + <string>The RunnableProcess +thread ends when there +are no more RunnableTokens</string> + </void> + </void> + </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>375.0</double> - <double>126.0</double> + <double>458.0</double> + <double>97.0</double> </void> </object> </void> <void method="addNode"> - <object class="com.horstmann.violet.CallNode"> - <void property="implicitParameter"> - <object idref="LifelineNode0"/> + <object id="PointNode2" class="com.horstmann.violet.PointNode"> + <void id="Rectangle2D$Double2" property="bounds"> + <void method="setRect"> + <double>440.0</double> + <double>195.0</double> + <double>0.0</double> + <double>0.0</double> + </void> </void> + <void property="bounds"> + <object idref="Rectangle2D$Double2"/> + </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>69.0</double> - <double>753.0</double> + <double>440.0</double> + <double>195.0</double> </void> </object> </void> <void method="addNode"> - <object idref="ActivationBarNode3"/> + <object idref="ActivationBarNode4"/> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>375.0</double> - <double>179.0</double> + <double>432.0</double> + <double>232.0</double> </void> </object> </void> + <void method="addNode"> + <object idref="ActivationBarNode12"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>432.0</double> + <double>626.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object idref="ActivationBarNode13"/> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>543.0</double> + <double>649.0</double> + </void> + </object> + </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> @@ -404,104 +509,137 @@ <object idref="ActivationBarNode1"/> </void> <void method="connect"> + <object class="com.horstmann.violet.NoteEdge"/> + <object idref="NoteNode0"/> + <object idref="PointNode0"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.NoteEdge"/> + <object idref="NoteNode1"/> + <object idref="PointNode1"/> + </void> + <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>getHeadFlow</string> + <string>create</string> </void> </object> <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode4"/> + <object idref="ActivationBarNode2"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>getTarget</string> + <string>create</string> </void> </object> <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode5"/> + <object idref="ActivationBarNode3"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>getFlowHandler</string> + <string>startToken</string> </void> </object> <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode8"/> + <object idref="ActivationBarNode5"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>transfer(tok)</string> + <string>start thread</string> </void> </object> - <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode9"/> + <object idref="ActivationBarNode5"/> + <object idref="ActivationBarNode6"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>addTailFlows</string> + <string>throwEnterSignal</string> </void> </object> - <object idref="ActivationBarNode9"/> - <object idref="ActivationBarNode10"/> + <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode8"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>getHeadFlow</string> + <string>execute</string> </void> </object> - <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode11"/> + <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode9"/> </void> <void method="connect"> - <object class="com.horstmann.violet.NoteEdge"/> - <object idref="NoteNode0"/> - <object idref="PointNode0"/> + <object class="com.horstmann.violet.CallEdge"> + <void property="middleLabel"> + <string>execute</string> + </void> + </object> + <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode10"/> </void> <void method="connect"> - <object class="com.horstmann.violet.NoteEdge"/> - <object idref="NoteNode1"/> - <object idref="PointNode1"/> + <object class="com.horstmann.violet.CallEdge"> + <void property="middleLabel"> + <string>getTarget</string> + </void> + </object> + <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode7"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>getExecutionHandler</string> + <string>waitForEnd</string> </void> </object> - <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode6"/> + <object idref="ActivationBarNode0"/> + <object idref="ActivationBarNode11"/> </void> <void method="connect"> + <object class="com.horstmann.violet.NoteEdge"/> + <object idref="NoteNode2"/> + <object idref="PointNode2"/> + </void> + <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>execute(tok)</string> + <string>start thread</string> </void> </object> <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode7"/> + <object idref="ActivationBarNode4"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>createToken</string> + <string>waitForEnd</string> </void> </object> - <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode2"/> + <object idref="ActivationBarNode11"/> + <object idref="ActivationBarNode12"/> </void> <void method="connect"> <object class="com.horstmann.violet.CallEdge"> <void property="middleLabel"> - <string>addTailFlow</string> + <string>hasRunnableTokens</string> </void> </object> - <object idref="ActivationBarNode1"/> - <object idref="ActivationBarNode3"/> + <object idref="ActivationBarNode12"/> + <object idref="ActivationBarNode13"/> </void> + <void method="connect"> + <object class="com.horstmann.violet.ReturnEdge"/> + <object idref="ActivationBarNode12"/> + <object idref="ActivationBarNode11"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ReturnEdge"/> + <object idref="ActivationBarNode11"/> + <object idref="ActivationBarNode0"/> + </void> </object> </java> Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -74,7 +74,8 @@ { synchronized (listeners) { - return Collections.unmodifiableSet(listeners); + HashSet<SignalListener> set = new HashSet<SignalListener>(listeners); + return Collections.unmodifiableSet(set); } } @@ -96,8 +97,8 @@ public void throwSignal(Signal signal) { log.debug("throwSignal: " + signal); - Set<SignalListener> currentListeners = getSignalListeners(); - for (SignalListener listener : currentListeners) + Set<SignalListener> currentSet = getSignalListeners(); + for (SignalListener listener : currentSet) { if (failsafeAccept(listener, signal)) failsafeThrow(listener, signal); Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -270,7 +270,10 @@ public ObjectName getTestID() { - return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", getShortName()); + String shortName = getShortName(); + shortName = shortName.replace("DescriptorTest", "Test"); + shortName = shortName.replace("MarshallerTest", "Test"); + return ObjectNameFactory.create(Constants.ID_DOMAIN, "test", shortName); } public List<Message> getMessages() @@ -292,7 +295,7 @@ { if (out == null) { - File file = new File("target/" + getName() + "-api10.xml"); + File file = new File("target/" + getName() + "-" + getDialect() + ".xml"); out = new FileWriter(file); System.out.println("Marshall process to: " + file.getCanonicalPath()); } @@ -314,11 +317,11 @@ */ public String marshallProcess(Process proc) throws IOException { - ProcessManager pm = ProcessManager.locateProcessManager(); - DialectHandler dhapi = pm.getDialectHandler(DialectHandler.DEFAULT_NAMESPACE_URI); + ProcessManager procManager = ProcessManager.locateProcessManager(); + DialectHandler dialectHandler = procManager.getDialectHandler(getDialectURI()); StringWriter strwr = new StringWriter(); - dhapi.marshallProcess(proc, strwr); + dialectHandler.marshallProcess(proc, strwr); return strwr.toString(); } @@ -328,6 +331,25 @@ protected String getShortName() { String shortName = getClass().getName(); - return shortName.substring(shortName.lastIndexOf(".") + 1); + shortName = shortName.substring(shortName.lastIndexOf(".") + 1); + return shortName; } + + /** + * Get the BPM descriptor dialect ID + */ + protected String getDialect() + { + String dialect = System.getProperty("jbpm.dialect", "api10"); + return dialect; + } + + /** + * Get the BPM descriptor dialect ID + */ + protected String getDialectURI() + { + String dialect = System.getProperty("jbpm.dialect.uri", DialectHandler.DEFAULT_NAMESPACE_URI); + return dialect; + } } Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -32,13 +32,4 @@ { return ProcessEngine.JBPM_ENGINE_CONFIG; } - - /** - * Get the jBPM descriptor dialect. - */ - protected String getDialect() - { - String dialect = System.getProperty("jbpm.dialect", "api10"); - return dialect; - } } Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ParticipantImpl.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -46,4 +46,10 @@ this.name = name; } + + @Override + public String toString() + { + return getParticipantType() + "[" + getName() + "]"; + } } Modified: jbossbpm/spec/trunk/modules/testsuite/pom.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/pom.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/pom.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -115,6 +115,25 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>jbpm.dialect</name> + <value>api10</value> + </property> + <property> + <name>jbpm.dialect.uri</name> + <value>urn:bpm.jboss:pdl-0.1</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + </systemProperties> + </configuration> + </plugin> </plugins> </build> @@ -133,6 +152,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> + <exclude>org/jboss/bpm/cts/**/*DescriptorTest.java</exclude> <exclude>org/jboss/bpm/cts/**/*MarshallerTest.java</exclude> <exclude>org/jboss/bpm/cts/**/*APITest.java</exclude> <exclude>org/jboss/bpm/cts/**/*STPTest.java</exclude> @@ -160,6 +180,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> + <exclude>org/jboss/bpm/pattern/**/*DescriptorTest.java</exclude> <exclude>org/jboss/bpm/pattern/**/*MarshallerTest.java</exclude> <exclude>org/jboss/bpm/pattern/**/*APITest.java</exclude> <exclude>org/jboss/bpm/pattern/**/*STPTest.java</exclude> Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.activity; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * + * An ActivityPropertyTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ActivityPropertiesDescriptorTest extends ActivityPropertiesTest +{ + @Override + protected Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/activity/activity-properties-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.activity; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * + * An ActivityPropertyTest using the ProcessMarshaller + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ActivityPropertiesMarshallerTest extends ActivityPropertiesTest +{ + @Override + protected Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + // System.out.println(procXML); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertiesTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.activity; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.MessageBuilder; +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.ProcessBuilderFactory; +import org.jboss.bpm.model.TaskBuilder; +import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These + * Properties are only for use within the processing of the activity. The fully delineated name of these properties is + * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status"). + * + * https://jira.jboss.org/jira/browse/JBPM-1621 + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ActivityPropertiesTest extends DefaultEngineTestCase +{ + public void testActivityPropertyRead() throws Exception + { + Process proc = getProcess(); + proc.startProcess(); + proc.waitForEnd(); + + Message endMessage = getMessages().get(0); + assertNotNull("EndMessage expected", endMessage); + assertEquals("bar", endMessage.getPropertyValue("propValue")); + } + + protected Process getProcess() throws IOException + { + ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA"); + TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + taskBuilder.addProperty("foo", "bar").addSequenceFlow("End"); + taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "propValue"); + procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); + MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); + msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); + Process proc = procBuilder.getProcess(); + return proc; + } +} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.cts.activity; - -// $Id$ - -import java.io.IOException; - -import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.model.Process; - -/** - * - * An ActivityPropertyTest using the ProcessMarshaller - * - * @author thomas.diesler(a)jboss.com - * @since 15-Aug-2008 - */ -public class ActivityPropertyMarshallerTest extends ActivityPropertyTest -{ - @Override - protected Process getProcess() throws IOException - { - // Marshall the process to a string - Process proc = super.getProcess(); - String procXML = marshallProcess(proc); - - // Recreate the process from the marshalled process - ProcessManager procManager = ProcessManager.locateProcessManager(); - return procManager.createProcess(procXML); - } -} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.cts.activity; - -// $Id$ - -import java.io.IOException; - -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageBuilder; -import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ProcessBuilder; -import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.TaskBuilder; -import org.jboss.bpm.model.Assignment.AssignTime; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.test.DefaultEngineTestCase; - -/** - * Modeler-defined Properties MAY be added to an activity. These Properties are "local" to the activity. These - * Properties are only for use within the processing of the activity. The fully delineated name of these properties is - * "<process name>.<activity name>.<property name>" (e.g., "Add Customer.Review Credit.Status"). - * - * https://jira.jboss.org/jira/browse/JBPM-1621 - * - * @author thomas.diesler(a)jboss.com - * @since 15-Aug-2008 - */ -public class ActivityPropertyTest extends DefaultEngineTestCase -{ - public void testActivityPropertyRead() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - proc.waitForEnd(); - - Message endMessage = getMessages().get(0); - assertNotNull("EndMessage expected", endMessage); - assertEquals("bar", endMessage.getPropertyValue("foo")); - } - - protected Process getProcess() throws IOException - { - ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); - taskBuilder.addProperty("foo", "bar").addSequenceFlow("End"); - taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ActivityProperties_TaskA_foo", "foo"); - procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); - MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); - msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); - Process proc = procBuilder.getProcess(); - return proc; - } -} Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.endevent; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test end event with message result + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class EndEventMessageDescriptorTest extends EndEventMessageTest +{ + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/endevent/endevent-message-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.endevent; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test end event with message result + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class EndEventMessageMarshallerTest extends EndEventMessageTest +{ + public Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + //System.out.println(procXML); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageMarshallerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.endevent; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.MessageBuilder; +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.ProcessBuilderFactory; +import org.jboss.bpm.model.EventDetail.EventDetailType; +import org.jboss.bpm.runtime.BasicAttachments; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Test end event with message result + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class EndEventMessageTest extends DefaultEngineTestCase +{ + public void testStart() throws Exception + { + Process proc = getProcess(); + + // Start the process + BasicAttachments att = new BasicAttachments(); + att.addAttachment("kermit", "the frog"); + proc.startProcess(att); + + // Wait for the process to end + proc.waitForEnd(); + + // Verify the result + Message endMessage = getMessages().get(0); + assertEquals("the frog", endMessage.getPropertyValue("kermit")); + } + + public Process getProcess() throws IOException + { + ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + procBuilder.addProcess("EndEventMessage").addStartEvent("Start"); + procBuilder.addSequenceFlow("TaskA").addTask("TaskA").addSequenceFlow("End"); + procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage"); + MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); + msgBuilder.addToRef(getTestID()).addProperty("kermit", null, true); + Process proc = procBuilder.getProcess(); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/endevent/EndEventMessageTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.exclusive; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * ExclusiveMergeTest using the Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ExclusiveGatewayMergeDescriptorTest extends ExclusiveGatewayMergeTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/exclusive/exclusive-merge-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -29,7 +29,7 @@ import org.jboss.bpm.model.Process; /** - * ExclusiveMergeTest using the API Descriptor + * ExclusiveMergeTest using the process Marshaller * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 @@ -43,6 +43,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -29,7 +29,6 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.Process; @@ -39,6 +38,7 @@ import org.jboss.bpm.model.TaskBuilder; import org.jboss.bpm.model.Assignment.AssignTime; import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -168,18 +168,16 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A").addSequenceFlow( - "TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA"); taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue"); taskBuilder.addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B").addSequenceFlow( - "TaskB"); - taskBuilder = procBuilder.addTask("TaskB"); + eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + taskBuilder = procBuilder.addSequenceFlow("TaskB").addTask("TaskB"); taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValue"); taskBuilder.addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", Gateway.GatewayType.Exclusive).addSequenceFlow("End"); + procBuilder.addGateway("Merge", GatewayType.Exclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.exclusive; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * ExclusiveSplitTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ExclusiveGatewaySplitDescriptorTest extends ExclusiveGatewaySplitTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/exclusive/exclusive-split-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -43,6 +43,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -95,9 +95,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive); - gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo > 10"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Exclusive); + gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.inclusive; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * InclusiveMergeTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class InclusiveGatewayMergeDescriptorTest extends InclusiveGatewayMergeTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/inclusive/inclusive-merge-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -43,6 +43,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -30,11 +30,11 @@ import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -81,7 +81,7 @@ eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); eventBuilder = procBuilder.addSequenceFlow("Merge").addStartEvent("StartB"); eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); - procBuilder.addSequenceFlow("Merge").addGateway("Merge", Gateway.GatewayType.Inclusive).addSequenceFlow("End"); + procBuilder.addSequenceFlow("Merge").addGateway("Merge", GatewayType.Inclusive).addSequenceFlow("End"); procBuilder.addEndEvent("End"); Process proc = procBuilder.getProcess(); return proc; Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.inclusive; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * InclusiveSplitTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class InclusiveGatewaySplitDescriptorTest extends InclusiveGatewaySplitTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/inclusive/inclusive-split-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -43,6 +43,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -26,13 +26,13 @@ import java.io.IOException; import java.util.List; -import org.jboss.bpm.model.Expression; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -76,9 +76,9 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("InclusiveGatewaySplitTest").addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Inclusive); - gatewayBuilder.addConditionalGate("EndA", Expression.ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", Expression.ExpressionLanguage.MVEL, "foo < 20"); + GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", GatewayType.Inclusive); + gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); + gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo < 20"); procBuilder.addEndEvent("EndA").addEndEvent("EndB"); Process proc = procBuilder.getProcess(); return proc; Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.parallel; + +//$Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + + +/** + * ParallelMergeTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ParallelGatewayMergeDescriptorTest extends ParallelGatewayMergeTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/parallel/parallel-merge-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -44,6 +44,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -28,8 +28,6 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.Process; @@ -38,7 +36,9 @@ import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.TaskBuilder; import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.EventDetail.EventDetailType; import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -160,17 +160,17 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA"); taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValueA"); taskBuilder.addSequenceFlow("Merge"); eventBuilder = procBuilder.addStartEvent("StartB"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); + eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "B"); taskBuilder = procBuilder.addSequenceFlow("TaskB").addTask("TaskB"); taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskB'", "taskValueB"); taskBuilder.addSequenceFlow("Merge"); - procBuilder.addGateway("Merge", Gateway.GatewayType.Parallel).addSequenceFlow("End"); - procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addGateway("Merge", GatewayType.Parallel).addSequenceFlow("End"); + procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValueA", null, true).addProperty("taskValueB", null, true); Process proc = procBuilder.getProcess(); Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.gateway.parallel; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * ParallelSplitTest using the API Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class ParallelGatewaySplitDescriptorTest extends ParallelGatewaySplitTest +{ + @Override + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/gateway/parallel/parallel-split-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -43,6 +43,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -28,29 +28,29 @@ import javax.management.ObjectName; -import org.jboss.bpm.model.Gateway; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; +import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Parallel gateway that has uncontrolled outgoing sequence flows. - * All of them are taken, which leads to parallel paths of execution. + * Parallel gateway that has uncontrolled outgoing sequence flows. All of them are taken, which leads to parallel paths + * of execution. * * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 */ public class ParallelGatewaySplitTest extends DefaultEngineTestCase { - public void testParallelSplit() throws Exception + public void testParallelSplit() throws Exception { Process proc = getProcess(); proc.startProcess(); proc.waitForEnd(); - + // Validate received signals List<Signal> signals = getSignals(SignalType.SYSTEM_END_EVENT_ENTER); assertEquals(2, signals.size()); @@ -64,8 +64,9 @@ public Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", Gateway.GatewayType.Parallel). - addSequenceFlow("EndA").addSequenceFlow("EndB").addEndEvent("EndA").addEndEvent("EndB").getProcess(); + procBuilder.addProcess("ParallelGatewaySplit").addStartEvent("Start").addSequenceFlow("Split"); + procBuilder.addGateway("Split", GatewayType.Parallel).addSequenceFlow("EndA").addSequenceFlow("EndB"); + Process proc = procBuilder.addEndEvent("EndA").addEndEvent("EndB").getProcess(); return proc; } } Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.process; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * + * An ProcessPropertyTest using the Descriptor + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ProcessPropertiesDescriptorTest extends ProcessPropertiesTest +{ + protected Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/process/process-properties-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.process; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * + * An ProcessPropertyTest using the ProcessMarshaller + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ProcessPropertiesMarshallerTest extends ProcessPropertiesTest +{ + protected Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Copied: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java (from rev 1984, jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java) =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertiesTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.process; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.model.EventDetail; +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.MessageBuilder; +import org.jboss.bpm.model.Process; +import org.jboss.bpm.model.ProcessBuilder; +import org.jboss.bpm.model.ProcessBuilderFactory; +import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.Expression.ExpressionLanguage; +import org.jboss.bpm.test.DefaultEngineTestCase; + +/** + * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks, + * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated + * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is + * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for + * as many Parents there are until the top level Process. + * + * https://jira.jboss.org/jira/browse/JBPM-1392 + * + * @author thomas.diesler(a)jboss.com + * @since 15-Aug-2008 + */ +public class ProcessPropertiesTest extends DefaultEngineTestCase +{ + /** + * Test the the process properties can be used by Assignments + * and finally arrive in through the End Message + */ + public void testProcessProperties() throws Exception + { + Process proc = getProcess(); + proc.startProcess(); + proc.waitForEnd(); + + Message endMessage = getMessages().get(0); + assertNotNull("EndMessage expected", endMessage); + assertEquals("bar", endMessage.getPropertyValue("propValue")); + } + + protected Process getProcess() throws IOException + { + ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA"); + procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue"); + procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End"); + procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); + MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); + msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); + Process proc = procBuilder.getProcess(); + return proc; + } +} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.cts.process; - -// $Id$ - -import java.io.IOException; - -import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.model.Process; - -/** - * - * An ProcessPropertyTest using the ProcessMarshaller - * - * @author thomas.diesler(a)jboss.com - * @since 15-Aug-2008 - */ -public class ProcessPropertyMarshallerTest extends ProcessPropertyTest -{ - protected Process getProcess() throws IOException - { - // Marshall the process to a string - Process proc = super.getProcess(); - String procXML = marshallProcess(proc); - - // Recreate the process from the marshalled process - ProcessManager procManager = ProcessManager.locateProcessManager(); - return procManager.createProcess(procXML); - } -} Deleted: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.cts.process; - -// $Id$ - -import java.io.IOException; - -import org.jboss.bpm.model.EventDetail; -import org.jboss.bpm.model.Message; -import org.jboss.bpm.model.MessageBuilder; -import org.jboss.bpm.model.Process; -import org.jboss.bpm.model.ProcessBuilder; -import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Assignment.AssignTime; -import org.jboss.bpm.model.Expression.ExpressionLanguage; -import org.jboss.bpm.test.DefaultEngineTestCase; - -/** - * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks, - * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated - * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is - * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for - * as many Parents there are until the top level Process. - * - * https://jira.jboss.org/jira/browse/JBPM-1392 - * - * @author thomas.diesler(a)jboss.com - * @since 15-Aug-2008 - */ -public class ProcessPropertyTest extends DefaultEngineTestCase -{ - public void testProcessProperties() throws Exception - { - Process proc = getProcess(); - proc.startProcess(); - proc.waitForEnd(); - - Message endMessage = getMessages().get(0); - assertNotNull("EndMessage expected", endMessage); - assertEquals("bar", endMessage.getPropertyValue("foo")); - } - - protected Process getProcess() throws IOException - { - ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "foo"); - procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End"); - procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); - MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); - msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); - Process proc = procBuilder.getProcess(); - return proc; - } -} Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.startevent; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test start event with signal trigger + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class StartEventSignalDescriptorTest extends StartEventSignalTest +{ + public Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/startevent/startevent-signal-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.startevent; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test start event with signal trigger + * + * @author thomas.diesler(a)jboss.com + * @since 06-Aug-2008 + */ +public class StartEventSignalMarshallerTest extends StartEventSignalTest +{ + public Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + //System.out.println(procXML); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalMarshallerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/startevent/StartEventSignalTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -29,7 +29,6 @@ import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.Process; @@ -38,6 +37,7 @@ import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.TaskBuilder; import org.jboss.bpm.model.Assignment.AssignTime; +import org.jboss.bpm.model.EventDetail.EventDetailType; import org.jboss.bpm.model.Expression.ExpressionLanguage; import org.jboss.bpm.model.Signal.SignalType; import org.jboss.bpm.test.DefaultEngineTestCase; @@ -126,13 +126,12 @@ public Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A") - .addSequenceFlow("TaskA"); - TaskBuilder taskBuilder = procBuilder.addTask("TaskA"); + EventBuilder eventBuilder = procBuilder.addProcess("StartEventSignal").addStartEvent("StartA"); + eventBuilder.addEventDetail(EventDetailType.Signal).addSignalRef(SignalType.SYSTEM_START_TRIGGER, "A"); + TaskBuilder taskBuilder = procBuilder.addSequenceFlow("TaskA").addTask("TaskA"); taskBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "'TaskA'", "taskValue"); taskBuilder.addSequenceFlow("End"); - procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); + procBuilder.addEndEvent("End").addEventDetail(EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); msgBuilder.addToRef(getTestID()).addProperty("taskValue", null, true); Process proc = procBuilder.getProcess(); Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.task; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test Receive Task + * + * @author thomas.diesler(a)jboss.com + * @since 03-Jul-2008 + */ +public class ReceiveTaskDescriptorTest extends ReceiveTaskTest +{ + @Override + protected Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/task/task-receive-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.task; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test Receive Task + * + * @author thomas.diesler(a)jboss.com + * @since 03-Jul-2008 + */ +public class ReceiveTaskMarshallerTest extends ReceiveTaskTest +{ + @Override + protected Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + //System.out.println(procXML); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskMarshallerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/ReceiveTaskTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -23,13 +23,14 @@ // $Id$ +import java.io.IOException; + import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.client.MessageManager; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; -import org.jboss.bpm.model.EventDetail; import org.jboss.bpm.model.Message; import org.jboss.bpm.model.MessageBuilder; import org.jboss.bpm.model.MessageBuilderFactory; @@ -37,12 +38,13 @@ import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; import org.jboss.bpm.model.Signal; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.EventDetail.EventDetailType; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.model.Task.TaskType; import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Test process messages + * Test Receive Task * * @author thomas.diesler(a)jboss.com * @since 03-Jul-2008 @@ -53,7 +55,7 @@ { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); procBuilder.addProcess("ReceiveTaskTest").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", Task.TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addTask("TaskA", TaskType.Receive).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcess(); @@ -147,7 +149,7 @@ return msg; } - private Process getProcess() + protected Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); MessageBuilder msgBuilder = procBuilder.addProcess("ReceiveTaskTest").addMessage("ReceiveTaskMessage"); @@ -155,9 +157,9 @@ msgBuilder = procBuilder.addMessage("EndEventMessage"); msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", Task.TaskType.Receive).addMessageRef("ReceiveTaskMessage"); + procBuilder.addTask("TaskA", TaskType.Receive).addMessageRef("ReceiveTaskMessage"); EventBuilder eventBuilder = procBuilder.addSequenceFlow("End").addEndEvent("End"); - eventBuilder.addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndEventMessage"); + eventBuilder.addEventDetail(EventDetailType.Message).addMessageRef("EndEventMessage"); return procBuilder.getProcess(); } } Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.task; + +// $Id$ + +import java.io.IOException; +import java.net.URL; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test Send Task + * + * @author thomas.diesler(a)jboss.com + * @since 03-Jul-2008 + */ +public class SendTaskDescriptorTest extends SendTaskTest +{ + @Override + protected Process getProcess() throws IOException + { + URL procURL = getResourceURL("cts/task/task-send-" + getDialect() + ".xml"); + ProcessManager pm = ProcessManager.locateProcessManager(); + Process proc = pm.createProcess(procURL); + return proc; + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskDescriptorTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.cts.task; + +// $Id$ + +import java.io.IOException; + +import org.jboss.bpm.client.ProcessManager; +import org.jboss.bpm.model.Process; + +/** + * Test Send Task + * + * @author thomas.diesler(a)jboss.com + * @since 03-Jul-2008 + */ +public class SendTaskMarshallerTest extends SendTaskTest +{ + @Override + protected Process getProcess() throws IOException + { + // Marshall the process to a string + Process proc = super.getProcess(); + String procXML = marshallProcess(proc); + + //System.out.println(procXML); + + // Recreate the process from the marshalled process + ProcessManager procManager = ProcessManager.locateProcessManager(); + return procManager.createProcess(procXML); + } +} Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskMarshallerTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/task/SendTaskTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -23,25 +23,46 @@ // $Id$ +import java.io.IOException; +import java.util.List; + import org.jboss.bpm.InvalidProcessException; +import org.jboss.bpm.model.Message; +import org.jboss.bpm.model.MessageBuilder; +import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; -import org.jboss.bpm.model.Task; +import org.jboss.bpm.model.Task.TaskType; +import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; /** - * Test process messages + * Test Send Task * * @author thomas.diesler(a)jboss.com * @since 03-Jul-2008 */ public class SendTaskTest extends DefaultEngineTestCase { + public void testSendTask() throws Exception + { + Process proc = getProcess(); + + BasicAttachments att = new BasicAttachments(); + att.addAttachment("foo", "bar"); + proc.startProcess(att); + proc.waitForEnd(); + + List<Message> messages = getMessages(); + assertEquals(1, messages.size()); + assertEquals("bar", messages.get(0).getPropertyValue("foo")); + } + public void testSendTaskWithNoMessage() throws Exception { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addTask("TaskA", Task.TaskType.Send).addSequenceFlow("End").addEndEvent("End"); + procBuilder.addProcess("SendTaskTest").addStartEvent("Start").addSequenceFlow("TaskA"); + procBuilder.addTask("TaskA", TaskType.Send).addSequenceFlow("End").addEndEvent("End"); try { procBuilder.getProcess(); @@ -52,4 +73,16 @@ // expected } } + + protected Process getProcess() throws IOException + { + ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); + MessageBuilder msgBuilder = procBuilder.addProcess("SendTaskTest").addMessage("SendTaskMessage"); + msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); + procBuilder.addStartEvent("Start").addSequenceFlow("TaskA"); + procBuilder.addTask("TaskA", TaskType.Send).addMessageRef("SendTaskMessage"); + procBuilder.addSequenceFlow("End").addEndEvent("End"); + Process proc = procBuilder.getProcess(); + return proc; + } } Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataMarshallerTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -45,6 +45,8 @@ Process proc = super.getProcess(); String procXML = marshallProcess(proc); + //System.out.println(procXML); + // Recreate the process from the marshalled process ProcessManager procManager = ProcessManager.locateProcessManager(); return procManager.createProcess(procXML); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/data/casedata/CaseDataTest.java 2008-08-22 18:56:09 UTC (rev 1987) @@ -54,18 +54,19 @@ Message endMessage = getMessages().get(0); assertNotNull("EndMessage expected", endMessage); - assertEquals("bar", endMessage.getPropertyValue("foo")); + assertEquals("bar", endMessage.getPropertyValue("propValue")); } protected Process getProcess() throws IOException { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); - procBuilder.addProcess("CaseData").addStartEvent("Start").addSequenceFlow("TaskA"); - procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "foo"); - procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End"); + procBuilder.addProcess("CaseData"); + procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "CaseData_foo", "propValue"); + procBuilder.addProperty("foo", "bar").addStartEvent("Start").addSequenceFlow("TaskA"); + procBuilder.addTask("TaskA").addSequenceFlow("End"); procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage"); MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage"); - msgBuilder.addToRef(getTestID()).addProperty("foo", null, true); + msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true); Process proc = procBuilder.getProcess(); return proc; } Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,27 @@ +<ns2:process name="ActivityProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="TaskA" /> + </start> + <task taskType="None" name="TaskA"> + <assignment time="Start"> + <from lang="MVEL">ActivityProperties_TaskA_foo</from> + <to>propValue</to> + </assignment> + <property> + <name>foo</name> + <value>bar</value> + </property> + <seqflow to="End" /> + </task> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=ActivityPropertiesTest</to> + <property correlation="true"> + <name>propValue</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/activity/activity-properties-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,19 @@ +<ns2:process name="EndEventMessage" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="TaskA" /> + </start> + <task taskType="None" name="TaskA"> + <seqflow to="End" /> + </task> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=EndEventMessageTest</to> + <property correlation="true"> + <name>kermit</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/endevent/endevent-message-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,24 +1,46 @@ -<ns2:process name="exclusive-merge" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> - <start> +<ns2:process name="testGateA" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="StartA"> <seqflow to="TaskA" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>A</message> + </signal> + </signal-trigger> </start> <task taskType="None" name="TaskA"> + <assignment time="Start"> + <from lang="MVEL">'TaskA'</from> + <to>taskValue</to> + </assignment> <seqflow to="Merge" /> - <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskA" /> </task> - <start> + <start name="StartB"> <seqflow to="TaskB" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>B</message> + </signal> + </signal-trigger> </start> <task taskType="None" name="TaskB"> + <assignment time="Start"> + <from lang="MVEL">'TaskB'</from> + <to>taskValue</to> + </assignment> <seqflow to="Merge" /> - <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskB" /> </task> <exclusive-gateway name="Merge"> - <seqflow to="TaskC" /> + <seqflow to="End" /> </exclusive-gateway> - <task taskType="None" name="TaskC"> - <seqflow to="End" /> - <execution-handler class="org.jboss.bpm.cts.gateway.exclusive.ExclusiveMergeTest$TaskC" /> - </task> - <end name="End" /> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=ExclusiveGatewayMergeTest</to> + <property correlation="true"> + <name>taskValue</name> + </property> + </message> </ns2:process> \ No newline at end of file Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn 2008-08-22 18:56:09 UTC (rev 1987) @@ -3,10 +3,10 @@ <pools xmi:type="bpmn:Pool" xmi:id="_l8n7IWOQEd2mS_8SFTXMeQ" iD="_l8n7IGOQEd2mS_8SFTXMeQ" name="Pool"> <vertices xmi:type="bpmn:Activity" xmi:id="_qdNxcWOQEd2mS_8SFTXMeQ" iD="_qdNxcGOQEd2mS_8SFTXMeQ" outgoingEdges="_uRhwkWOQEd2mS_8SFTXMeQ" name="StartA" activityType="EventStartSignal"/> <vertices xmi:type="bpmn:Activity" xmi:id="_rWe7wWOQEd2mS_8SFTXMeQ" iD="_rWe7wGOQEd2mS_8SFTXMeQ" outgoingEdges="_u0nPgWOQEd2mS_8SFTXMeQ" name="StartB" activityType="EventStartSignal"/> - <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_w0h40WOQEd2mS_8SFTXMeQ" incomingEdges="_uRhwkWOQEd2mS_8SFTXMeQ _u0nPgWOQEd2mS_8SFTXMeQ" activityType="GatewayDataBasedExclusive"/> - <vertices xmi:type="bpmn:Activity" xmi:id="_tWoOkWOQEd2mS_8SFTXMeQ" iD="_tWoOkGOQEd2mS_8SFTXMeQ" incomingEdges="_w0h40WOQEd2mS_8SFTXMeQ" activityType="EventEndEmpty"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_sa_FsWOQEd2mS_8SFTXMeQ" iD="_sa_FsGOQEd2mS_8SFTXMeQ" outgoingEdges="_glA-AXBZEd26O4vNTVSBiw" incomingEdges="_uRhwkWOQEd2mS_8SFTXMeQ _u0nPgWOQEd2mS_8SFTXMeQ" activityType="GatewayDataBasedExclusive"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_f-UKYXBZEd26O4vNTVSBiw" iD="_f-UKYHBZEd26O4vNTVSBiw" incomingEdges="_glA-AXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_uRhwkWOQEd2mS_8SFTXMeQ" iD="_uRhwkGOQEd2mS_8SFTXMeQ" source="_qdNxcWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_u0nPgWOQEd2mS_8SFTXMeQ" iD="_u0nPgGOQEd2mS_8SFTXMeQ" source="_rWe7wWOQEd2mS_8SFTXMeQ" target="_sa_FsWOQEd2mS_8SFTXMeQ"/> - <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_w0h40WOQEd2mS_8SFTXMeQ" iD="_w0h40GOQEd2mS_8SFTXMeQ" source="_sa_FsWOQEd2mS_8SFTXMeQ" target="_tWoOkWOQEd2mS_8SFTXMeQ"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_glA-AXBZEd26O4vNTVSBiw" iD="_glA-AHBZEd26O4vNTVSBiw" source="_sa_FsWOQEd2mS_8SFTXMeQ" target="_f-UKYXBZEd26O4vNTVSBiw"/> </pools> </bpmn:BpmnDiagram> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-merge.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987) @@ -30,14 +30,14 @@ <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_sa_FsWOQEd2mS_8SFTXMeQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sbAT0GOQEd2mS_8SFTXMeQ" x="134" y="74"/> </children> - <children xmi:type="notation:Node" xmi:id="_tWpcsGOQEd2mS_8SFTXMeQ" type="2001"> - <children xmi:type="notation:Node" xmi:id="_tWqDwGOQEd2mS_8SFTXMeQ" type="4001"/> - <styles xmi:type="notation:FontStyle" xmi:id="_tWpcsWOQEd2mS_8SFTXMeQ" fontName="Arial"/> - <styles xmi:type="notation:DescriptionStyle" xmi:id="_tWpcsmOQEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:FillStyle" xmi:id="_tWpcs2OQEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:LineStyle" xmi:id="_tWpctGOQEd2mS_8SFTXMeQ" lineColor="0"/> - <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_tWoOkWOQEd2mS_8SFTXMeQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tWpctWOQEd2mS_8SFTXMeQ" x="252" y="84"/> + <children xmi:type="notation:Node" xmi:id="_f-Zp8HBZEd26O4vNTVSBiw" type="2001"> + <children xmi:type="notation:Node" xmi:id="_f-bfIHBZEd26O4vNTVSBiw" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_f-Zp8XBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_f-Zp8nBZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:FillStyle" xmi:id="_f-Zp83BZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:LineStyle" xmi:id="_f-Zp9HBZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="exclusive-merge.bpmn#_f-UKYXBZEd26O4vNTVSBiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Zp9XBZEd26O4vNTVSBiw" x="238" y="84"/> </children> <styles xmi:type="notation:DrawerStyle" xmi:id="_l8qXYWOQEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_l8qXYmOQEd2mS_8SFTXMeQ"/> @@ -78,16 +78,16 @@ <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_u0nPgWOQEd2mS_8SFTXMeQ"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_u0odpGOQEd2mS_8SFTXMeQ" points="[15, -7, -86, 27]$[112, -48, 11, -14]"/> </edges> - <edges xmi:type="notation:Edge" xmi:id="_w0jG8GOQEd2mS_8SFTXMeQ" type="3001" source="_sa_swGOQEd2mS_8SFTXMeQ" target="_tWpcsGOQEd2mS_8SFTXMeQ"> - <children xmi:type="notation:Node" xmi:id="_w0juAGOQEd2mS_8SFTXMeQ" type="4012"> - <styles xmi:type="notation:FillStyle" xmi:id="_w0juAWOQEd2mS_8SFTXMeQ" fillColor="16776959"/> - <styles xmi:type="notation:LineStyle" xmi:id="_w0juAmOQEd2mS_8SFTXMeQ" lineColor="16776959"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_w0juA2OQEd2mS_8SFTXMeQ" y="40"/> + <edges xmi:type="notation:Edge" xmi:id="_glDaQHBZEd26O4vNTVSBiw" type="3001" source="_sa_swGOQEd2mS_8SFTXMeQ" target="_f-Zp8HBZEd26O4vNTVSBiw"> + <children xmi:type="notation:Node" xmi:id="_glEoYHBZEd26O4vNTVSBiw" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_glEoYXBZEd26O4vNTVSBiw" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_glEoYnBZEd26O4vNTVSBiw" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_glEoY3BZEd26O4vNTVSBiw" y="40"/> </children> - <styles xmi:type="notation:RoutingStyle" xmi:id="_w0jG8WOQEd2mS_8SFTXMeQ" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> - <styles xmi:type="notation:FontStyle" xmi:id="_w0jG8mOQEd2mS_8SFTXMeQ" fontName="Arial"/> - <styles xmi:type="notation:LineStyle" xmi:id="_w0jG82OQEd2mS_8SFTXMeQ" lineColor="0"/> - <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_w0h40WOQEd2mS_8SFTXMeQ"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w0jG9GOQEd2mS_8SFTXMeQ" points="[23, 1, -85, 1]$[109, 15, 1, 15]"/> + <styles xmi:type="notation:RoutingStyle" xmi:id="_glDaQXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_glDaQnBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_glDaQ3BZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="exclusive-merge.bpmn#_glA-AXBZEd26O4vNTVSBiw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_glDaRHBZEd26O4vNTVSBiw" points="[24, -1, -70, -1]$[109, -1, 15, -1]"/> </edges> </notation:Diagram> Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,15 @@ +<ns2:process name="testGateA" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="Split" /> + </start> + <exclusive-gateway name="Split"> + <seqflow conditionType="Expression" to="EndA"> + <condition lang="MVEL">foo &lt; 10</condition> + </seqflow> + <seqflow conditionType="Expression" to="EndB"> + <condition lang="MVEL">foo &gt; 10</condition> + </seqflow> + </exclusive-gateway> + <end name="EndA"/> + <end name="EndB"/> +</ns2:process> Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/exclusive/exclusive-split-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,22 @@ +<ns2:process name="testGateA" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="StartA"> + <seqflow to="Merge" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>A</message> + </signal> + </signal-trigger> + </start> + <start name="StartB"> + <seqflow to="Merge" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>B</message> + </signal> + </signal-trigger> + </start> + <inclusive-gateway name="Merge"> + <seqflow to="End" /> + </inclusive-gateway> + <end name="End" /> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-merge-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,15 @@ +<ns2:process name="InclusiveGatewaySplitTest" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="Split" /> + </start> + <inclusive-gateway name="Split"> + <seqflow conditionType="Expression" to="EndA"> + <condition lang="MVEL">foo &lt; 10</condition> + </seqflow> + <seqflow conditionType="Expression" to="EndB"> + <condition lang="MVEL">foo &lt; 20</condition> + </seqflow> + </inclusive-gateway> + <end name="EndA"/> + <end name="EndB"/> +</ns2:process> Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/inclusive/inclusive-split-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,49 @@ +<ns2:process name="testParallelMerge" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="StartA"> + <seqflow to="TaskA" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>A</message> + </signal> + </signal-trigger> + </start> + <task taskType="None" name="TaskA"> + <assignment time="Start"> + <from lang="MVEL">'TaskA'</from> + <to>taskValueA</to> + </assignment> + <seqflow to="Merge" /> + </task> + <start name="StartB"> + <seqflow to="TaskB" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>B</message> + </signal> + </signal-trigger> + </start> + <task taskType="None" name="TaskB"> + <assignment time="Start"> + <from lang="MVEL">'TaskB'</from> + <to>taskValueB</to> + </assignment> + <seqflow to="Merge" /> + </task> + <parallel-gateway name="Merge"> + <seqflow to="End" /> + </parallel-gateway> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=ParallelGatewayMergeTest</to> + <property correlation="true"> + <name>taskValueA</name> + </property> + <property correlation="true"> + <name>taskValueB</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_AXFyUWOSEd2mS_8SFTXMeQ" iD="_AXFyUGOSEd2mS_8SFTXMeQ"> <pools xmi:type="bpmn:Pool" xmi:id="_AXHAcWOSEd2mS_8SFTXMeQ" iD="_AXHAcGOSEd2mS_8SFTXMeQ" name="Pool"> - <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_6HqqgWlWEd2VTpmAjt3VIA" incomingEdges="_x1ziAWlWEd2VTpmAjt3VIA _25I5AWlWEd2VTpmAjt3VIA" activityType="GatewayParallel"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_wcB6AXBZEd26O4vNTVSBiw" incomingEdges="_x1ziAWlWEd2VTpmAjt3VIA _25I5AWlWEd2VTpmAjt3VIA" activityType="GatewayParallel"/> <vertices xmi:type="bpmn:Activity" xmi:id="_FY9wwWOSEd2mS_8SFTXMeQ" iD="_FY9wwGOSEd2mS_8SFTXMeQ" outgoingEdges="_xbzGkWlWEd2VTpmAjt3VIA" name="StartA" activityType="EventStartSignal"/> <vertices xmi:type="bpmn:Activity" xmi:id="_FobwIWOSEd2mS_8SFTXMeQ" iD="_FobwIGOSEd2mS_8SFTXMeQ" outgoingEdges="_1inyAWlWEd2VTpmAjt3VIA" name="StartB" activityType="EventStartSignal"/> - <vertices xmi:type="bpmn:Activity" xmi:id="_LFtRIWOSEd2mS_8SFTXMeQ" iD="_LFtRIGOSEd2mS_8SFTXMeQ" incomingEdges="_696WAWlWEd2VTpmAjt3VIA" activityType="EventEndEmpty"/> <vertices xmi:type="bpmn:Activity" xmi:id="_tQcgcWlWEd2VTpmAjt3VIA" iD="_tQcgcGlWEd2VTpmAjt3VIA" outgoingEdges="_x1ziAWlWEd2VTpmAjt3VIA" incomingEdges="_xbzGkWlWEd2VTpmAjt3VIA" name="TaskA"/> <vertices xmi:type="bpmn:Activity" xmi:id="_y-u48WlWEd2VTpmAjt3VIA" iD="_y-u48GlWEd2VTpmAjt3VIA" outgoingEdges="_25I5AWlWEd2VTpmAjt3VIA" incomingEdges="_1inyAWlWEd2VTpmAjt3VIA" name="TaskB"/> - <vertices xmi:type="bpmn:Activity" xmi:id="_4Egf8WlWEd2VTpmAjt3VIA" iD="_4Egf8GlWEd2VTpmAjt3VIA" outgoingEdges="_696WAWlWEd2VTpmAjt3VIA" incomingEdges="_6HqqgWlWEd2VTpmAjt3VIA" name="TaskC"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_vxNbYXBZEd26O4vNTVSBiw" iD="_vxNbYHBZEd26O4vNTVSBiw" incomingEdges="_wcB6AXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_xbzGkWlWEd2VTpmAjt3VIA" iD="_xbzGkGlWEd2VTpmAjt3VIA" source="_FY9wwWOSEd2mS_8SFTXMeQ" target="_tQcgcWlWEd2VTpmAjt3VIA"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_x1ziAWlWEd2VTpmAjt3VIA" iD="_x1ziAGlWEd2VTpmAjt3VIA" source="_tQcgcWlWEd2VTpmAjt3VIA" target="_EPuQwWOSEd2mS_8SFTXMeQ"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_1inyAWlWEd2VTpmAjt3VIA" iD="_1inyAGlWEd2VTpmAjt3VIA" source="_FobwIWOSEd2mS_8SFTXMeQ" target="_y-u48WlWEd2VTpmAjt3VIA"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_25I5AWlWEd2VTpmAjt3VIA" iD="_25I5AGlWEd2VTpmAjt3VIA" source="_y-u48WlWEd2VTpmAjt3VIA" target="_EPuQwWOSEd2mS_8SFTXMeQ"/> - <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_6HqqgWlWEd2VTpmAjt3VIA" iD="_6HqqgGlWEd2VTpmAjt3VIA" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_4Egf8WlWEd2VTpmAjt3VIA"/> - <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_696WAWlWEd2VTpmAjt3VIA" iD="_696WAGlWEd2VTpmAjt3VIA" source="_4Egf8WlWEd2VTpmAjt3VIA" target="_LFtRIWOSEd2mS_8SFTXMeQ"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_wcB6AXBZEd26O4vNTVSBiw" iD="_wcB6AHBZEd26O4vNTVSBiw" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_vxNbYXBZEd26O4vNTVSBiw"/> </pools> </bpmn:BpmnDiagram> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-merge.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987) @@ -30,15 +30,6 @@ <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_FobwIWOSEd2mS_8SFTXMeQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Foc-RWOSEd2mS_8SFTXMeQ" x="36" y="144"/> </children> - <children xmi:type="notation:Node" xmi:id="_LFt4MGOSEd2mS_8SFTXMeQ" type="2001"> - <children xmi:type="notation:Node" xmi:id="_LFufRWOSEd2mS_8SFTXMeQ" type="4001"/> - <styles xmi:type="notation:FontStyle" xmi:id="_LFufQGOSEd2mS_8SFTXMeQ" fontName="Arial"/> - <styles xmi:type="notation:DescriptionStyle" xmi:id="_LFufQWOSEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:FillStyle" xmi:id="_LFufQmOSEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:LineStyle" xmi:id="_LFufQ2OSEd2mS_8SFTXMeQ" lineColor="0"/> - <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_LFtRIWOSEd2mS_8SFTXMeQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFufRGOSEd2mS_8SFTXMeQ" x="492" y="84"/> - </children> <children xmi:type="notation:Node" xmi:id="_tQlDUGlWEd2VTpmAjt3VIA" type="2001"> <children xmi:type="notation:Node" xmi:id="_tQmRcGlWEd2VTpmAjt3VIA" type="4001"/> <styles xmi:type="notation:FontStyle" xmi:id="_tQlDUWlWEd2VTpmAjt3VIA" fontName="Arial"/> @@ -57,14 +48,14 @@ <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_y-u48WlWEd2VTpmAjt3VIA"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y-wHFWlWEd2VTpmAjt3VIA" x="96" y="132"/> </children> - <children xmi:type="notation:Node" xmi:id="_4EhHAGlWEd2VTpmAjt3VIA" type="2001"> - <children xmi:type="notation:Node" xmi:id="_4EhuEGlWEd2VTpmAjt3VIA" type="4001"/> - <styles xmi:type="notation:FontStyle" xmi:id="_4EhHAWlWEd2VTpmAjt3VIA" fontName="Arial"/> - <styles xmi:type="notation:DescriptionStyle" xmi:id="_4EhHAmlWEd2VTpmAjt3VIA"/> - <styles xmi:type="notation:FillStyle" xmi:id="_4EhHA2lWEd2VTpmAjt3VIA"/> - <styles xmi:type="notation:LineStyle" xmi:id="_4EhHBGlWEd2VTpmAjt3VIA" lineColor="0"/> - <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_4Egf8WlWEd2VTpmAjt3VIA"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4EhHBWlWEd2VTpmAjt3VIA" x="336" y="72"/> + <children xmi:type="notation:Node" xmi:id="_vxOpgHBZEd26O4vNTVSBiw" type="2001"> + <children xmi:type="notation:Node" xmi:id="_vxPQkHBZEd26O4vNTVSBiw" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_vxOpgXBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_vxOpgnBZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:FillStyle" xmi:id="_vxOpg3BZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:LineStyle" xmi:id="_vxOphHBZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="parallel-merge.bpmn#_vxNbYXBZEd26O4vNTVSBiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vxOphXBZEd26O4vNTVSBiw" x="348" y="84"/> </children> <styles xmi:type="notation:DrawerStyle" xmi:id="_AXI1omOSEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_AXI1o2OSEd2mS_8SFTXMeQ"/> @@ -75,7 +66,7 @@ <styles xmi:type="notation:FillStyle" xmi:id="_AXIOk2OSEd2mS_8SFTXMeQ" fillColor="16771304"/> <styles xmi:type="notation:LineStyle" xmi:id="_AXIOlGOSEd2mS_8SFTXMeQ" lineColor="11119017"/> <element xmi:type="bpmn:Pool" href="parallel-merge.bpmn#_AXHAcWOSEd2mS_8SFTXMeQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="585" height="213"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="441" height="213"/> </children> <styles xmi:type="notation:PageStyle" xmi:id="_AXGZYWOSEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:GuideStyle" xmi:id="_AXGZYmOSEd2mS_8SFTXMeQ"/> @@ -129,28 +120,16 @@ <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_25I5AWlWEd2VTpmAjt3VIA"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_25KHJGlWEd2VTpmAjt3VIA" points="[54, -10, -254, 53]$[303, -43, -5, 20]"/> </edges> - <edges xmi:type="notation:Edge" xmi:id="_6Hr4oGlWEd2VTpmAjt3VIA" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_4EhHAGlWEd2VTpmAjt3VIA"> - <children xmi:type="notation:Node" xmi:id="_6HsfsWlWEd2VTpmAjt3VIA" type="4012"> - <styles xmi:type="notation:FillStyle" xmi:id="_6HsfsmlWEd2VTpmAjt3VIA" fillColor="16776959"/> - <styles xmi:type="notation:LineStyle" xmi:id="_6Hsfs2lWEd2VTpmAjt3VIA" lineColor="16776959"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_6HsftGlWEd2VTpmAjt3VIA" y="-10"/> + <edges xmi:type="notation:Edge" xmi:id="_wcDIIHBZEd26O4vNTVSBiw" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_vxOpgHBZEd26O4vNTVSBiw"> + <children xmi:type="notation:Node" xmi:id="_wcDvMHBZEd26O4vNTVSBiw" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_wcDvMXBZEd26O4vNTVSBiw" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_wcDvMnBZEd26O4vNTVSBiw" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_wcDvM3BZEd26O4vNTVSBiw" y="-10"/> </children> - <styles xmi:type="notation:RoutingStyle" xmi:id="_6Hr4oWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> - <styles xmi:type="notation:FontStyle" xmi:id="_6Hr4omlWEd2VTpmAjt3VIA" fontName="Arial"/> - <styles xmi:type="notation:LineStyle" xmi:id="_6Hr4o2lWEd2VTpmAjt3VIA" lineColor="0"/> - <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_6HqqgWlWEd2VTpmAjt3VIA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6HsfsGlWEd2VTpmAjt3VIA" points="[22, -3, -154, -6]$[175, -25, -1, -28]"/> + <styles xmi:type="notation:RoutingStyle" xmi:id="_wcDIIXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_wcDIInBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_wcDII3BZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_wcB6AXBZEd26O4vNTVSBiw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wcDIJHBZEd26O4vNTVSBiw" points="[23, -2, -63, -4]$[101, -13, 15, -15]"/> </edges> - <edges xmi:type="notation:Edge" xmi:id="_697kIGlWEd2VTpmAjt3VIA" type="3001" source="_4EhHAGlWEd2VTpmAjt3VIA" target="_LFt4MGOSEd2mS_8SFTXMeQ"> - <children xmi:type="notation:Node" xmi:id="_698LMGlWEd2VTpmAjt3VIA" type="4012"> - <styles xmi:type="notation:FillStyle" xmi:id="_698LMWlWEd2VTpmAjt3VIA" fillColor="16776959"/> - <styles xmi:type="notation:LineStyle" xmi:id="_698LMmlWEd2VTpmAjt3VIA" lineColor="16776959"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_698LM2lWEd2VTpmAjt3VIA" y="-10"/> - </children> - <styles xmi:type="notation:RoutingStyle" xmi:id="_697kIWlWEd2VTpmAjt3VIA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> - <styles xmi:type="notation:FontStyle" xmi:id="_697kImlWEd2VTpmAjt3VIA" fontName="Arial"/> - <styles xmi:type="notation:LineStyle" xmi:id="_697kI2lWEd2VTpmAjt3VIA" lineColor="0"/> - <element xmi:type="bpmn:SequenceEdge" href="parallel-merge.bpmn#_696WAWlWEd2VTpmAjt3VIA"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_697kJGlWEd2VTpmAjt3VIA" points="[54, -2, -88, -1]$[127, -16, -15, -15]"/> - </edges> </notation:Diagram> Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,11 @@ +<ns2:process name="ParallelGatewaySplit" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="Split" /> + </start> + <parallel-gateway name="Split"> + <seqflow to="EndA" /> + <seqflow to="EndB" /> + </parallel-gateway> + <end name="EndA" /> + <end name="EndB" /> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/gateway/parallel/parallel-split-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,27 @@ +<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <assignment time="Start"> + <from lang="MVEL">ProcessProperties_foo</from> + <to>propValue</to> + </assignment> + <seqflow to="TaskA" /> + </start> + <task taskType="None" name="TaskA"> + <seqflow to="End" /> + </task> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=ProcessPropertiesTest</to> + <property correlation="true"> + <name>propValue</name> + </property> + </message> + <property> + <name>foo</name> + <value>bar</value> + </property> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/process/process-properties-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,28 @@ +<ns2:process name="testStart" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="StartA"> + <seqflow to="TaskA" /> + <signal-trigger> + <signal type="SYSTEM_START_TRIGGER"> + <message>A</message> + </signal> + </signal-trigger> + </start> + <task taskType="None" name="TaskA"> + <assignment time="Start"> + <from lang="MVEL">'TaskA'</from> + <to>taskValue</to> + </assignment> + <seqflow to="End" /> + </task> + <end name="End"> + <message-result> + <messageRef nameRef="EndMessage" /> + </message-result> + </end> + <message name="EndMessage"> + <to>jboss.bpm:test=StartEventSignalTest</to> + <property correlation="true"> + <name>taskValue</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/startevent/startevent-signal-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,25 @@ +<ns2:process name="ReceiveTaskTest" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="TaskA" /> + </start> + <task taskType="Receive" name="TaskA"> + <seqflow to="End" /> + <msgref nameRef="ReceiveTaskMessage" /> + </task> + <end name="End"> + <message-result> + <messageRef nameRef="EndEventMessage" /> + </message-result> + </end> + <message name="ReceiveTaskMessage"> + <property correlation="true"> + <name>foo</name> + </property> + </message> + <message name="EndEventMessage"> + <to>jboss.bpm:test=ReceiveTaskTest</to> + <property correlation="true"> + <name>foo</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-receive-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml (rev 0) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -0,0 +1,16 @@ +<ns2:process name="SendTaskTest" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> + <start name="Start"> + <seqflow to="TaskA" /> + </start> + <task taskType="Send" name="TaskA"> + <seqflow to="End" /> + <msgref nameRef="SendTaskMessage" /> + </task> + <end name="End" /> + <message name="SendTaskMessage"> + <to>jboss.bpm:test=SendTaskTest</to> + <property correlation="true"> + <name>foo</name> + </property> + </message> +</ns2:process> \ No newline at end of file Property changes on: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/cts/task/task-send-api10.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -38,7 +38,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:test=SynchronizationDescriptorTest</to> + <to>jboss.bpm:test=SynchronizationTest</to> <property correlation="true"> <name>taskValueA</name> </property> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_AXFyUWOSEd2mS_8SFTXMeQ" iD="_AXFyUGOSEd2mS_8SFTXMeQ"> <pools xmi:type="bpmn:Pool" xmi:id="_AXHAcWOSEd2mS_8SFTXMeQ" iD="_AXHAcGOSEd2mS_8SFTXMeQ" name="Pool"> - <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_YRqagWo0Ed2rarCPPgIl8w" incomingEdges="_YxTj4Wo0Ed2rarCPPgIl8w _ZZSw8Wo0Ed2rarCPPgIl8w" activityType="GatewayParallel"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_EPuQwWOSEd2mS_8SFTXMeQ" iD="_EPuQwGOSEd2mS_8SFTXMeQ" outgoingEdges="_8DqrgXBZEd26O4vNTVSBiw" incomingEdges="_YxTj4Wo0Ed2rarCPPgIl8w _ZZSw8Wo0Ed2rarCPPgIl8w" activityType="GatewayParallel"/> <vertices xmi:type="bpmn:Activity" xmi:id="_FY9wwWOSEd2mS_8SFTXMeQ" iD="_FY9wwGOSEd2mS_8SFTXMeQ" outgoingEdges="_YxTj4Wo0Ed2rarCPPgIl8w" name="StartA" activityType="EventStartSignal"/> <vertices xmi:type="bpmn:Activity" xmi:id="_FobwIWOSEd2mS_8SFTXMeQ" iD="_FobwIGOSEd2mS_8SFTXMeQ" outgoingEdges="_ZZSw8Wo0Ed2rarCPPgIl8w" name="StartB" activityType="EventStartSignal"/> - <vertices xmi:type="bpmn:Activity" xmi:id="_LFtRIWOSEd2mS_8SFTXMeQ" iD="_LFtRIGOSEd2mS_8SFTXMeQ" incomingEdges="_YRqagWo0Ed2rarCPPgIl8w" activityType="EventEndEmpty"/> - <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_YRqagWo0Ed2rarCPPgIl8w" iD="_YRqagGo0Ed2rarCPPgIl8w" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_LFtRIWOSEd2mS_8SFTXMeQ"/> + <vertices xmi:type="bpmn:Activity" xmi:id="_7UIE8XBZEd26O4vNTVSBiw" iD="_7UIE8HBZEd26O4vNTVSBiw" incomingEdges="_8DqrgXBZEd26O4vNTVSBiw" activityType="EventEndMessage"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_YxTj4Wo0Ed2rarCPPgIl8w" iD="_YxTj4Go0Ed2rarCPPgIl8w" source="_FY9wwWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/> <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_ZZSw8Wo0Ed2rarCPPgIl8w" iD="_ZZSw8Go0Ed2rarCPPgIl8w" source="_FobwIWOSEd2mS_8SFTXMeQ" target="_EPuQwWOSEd2mS_8SFTXMeQ"/> + <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_8DqrgXBZEd26O4vNTVSBiw" iD="_8DqrgHBZEd26O4vNTVSBiw" source="_EPuQwWOSEd2mS_8SFTXMeQ" target="_7UIE8XBZEd26O4vNTVSBiw"/> </pools> </bpmn:BpmnDiagram> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.bpmn_diagram 2008-08-22 18:56:09 UTC (rev 1987) @@ -30,14 +30,14 @@ <element xmi:type="bpmn:Activity" href="pattern-control-synchronization.bpmn#_FobwIWOSEd2mS_8SFTXMeQ"/> <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Foc-RWOSEd2mS_8SFTXMeQ" x="36" y="144"/> </children> - <children xmi:type="notation:Node" xmi:id="_LFt4MGOSEd2mS_8SFTXMeQ" type="2001"> - <children xmi:type="notation:Node" xmi:id="_LFufRWOSEd2mS_8SFTXMeQ" type="4001"/> - <styles xmi:type="notation:FontStyle" xmi:id="_LFufQGOSEd2mS_8SFTXMeQ" fontName="Arial"/> - <styles xmi:type="notation:DescriptionStyle" xmi:id="_LFufQWOSEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:FillStyle" xmi:id="_LFufQmOSEd2mS_8SFTXMeQ"/> - <styles xmi:type="notation:LineStyle" xmi:id="_LFufQ2OSEd2mS_8SFTXMeQ" lineColor="0"/> - <element xmi:type="bpmn:Activity" href="pattern-control-synchronization.bpmn#_LFtRIWOSEd2mS_8SFTXMeQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LFufRGOSEd2mS_8SFTXMeQ" x="252" y="84"/> + <children xmi:type="notation:Node" xmi:id="_7UJTEHBZEd26O4vNTVSBiw" type="2001"> + <children xmi:type="notation:Node" xmi:id="_7UJ6IHBZEd26O4vNTVSBiw" type="4001"/> + <styles xmi:type="notation:FontStyle" xmi:id="_7UJTEXBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:DescriptionStyle" xmi:id="_7UJTEnBZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:FillStyle" xmi:id="_7UJTE3BZEd26O4vNTVSBiw"/> + <styles xmi:type="notation:LineStyle" xmi:id="_7UJTFHBZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:Activity" href="pattern-control-synchronization.bpmn#_7UIE8XBZEd26O4vNTVSBiw"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7UJTFXBZEd26O4vNTVSBiw" x="240" y="84"/> </children> <styles xmi:type="notation:DrawerStyle" xmi:id="_AXI1omOSEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:SortingStyle" xmi:id="_AXI1o2OSEd2mS_8SFTXMeQ"/> @@ -48,24 +48,12 @@ <styles xmi:type="notation:FillStyle" xmi:id="_AXIOk2OSEd2mS_8SFTXMeQ" fillColor="16771304"/> <styles xmi:type="notation:LineStyle" xmi:id="_AXIOlGOSEd2mS_8SFTXMeQ" lineColor="11119017"/> <element xmi:type="bpmn:Pool" href="pattern-control-synchronization.bpmn#_AXHAcWOSEd2mS_8SFTXMeQ"/> - <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="357" height="213"/> + <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AXI1pWOSEd2mS_8SFTXMeQ" x="16" y="16" width="345" height="213"/> </children> <styles xmi:type="notation:PageStyle" xmi:id="_AXGZYWOSEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:GuideStyle" xmi:id="_AXGZYmOSEd2mS_8SFTXMeQ"/> <styles xmi:type="notation:DescriptionStyle" xmi:id="_AXGZY2OSEd2mS_8SFTXMeQ"/> <element xmi:type="bpmn:BpmnDiagram" href="pattern-control-synchronization.bpmn#_AXFyUWOSEd2mS_8SFTXMeQ"/> - <edges xmi:type="notation:Edge" xmi:id="_YRv6EGo0Ed2rarCPPgIl8w" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_LFt4MGOSEd2mS_8SFTXMeQ"> - <children xmi:type="notation:Node" xmi:id="_YRzkcGo0Ed2rarCPPgIl8w" type="4012"> - <styles xmi:type="notation:FillStyle" xmi:id="_YRzkcWo0Ed2rarCPPgIl8w" fillColor="16776959"/> - <styles xmi:type="notation:LineStyle" xmi:id="_YRzkcmo0Ed2rarCPPgIl8w" lineColor="16776959"/> - <layoutConstraint xmi:type="notation:Location" xmi:id="_YRzkc2o0Ed2rarCPPgIl8w" y="-10"/> - </children> - <styles xmi:type="notation:RoutingStyle" xmi:id="_YRv6EWo0Ed2rarCPPgIl8w" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> - <styles xmi:type="notation:FontStyle" xmi:id="_YRv6Emo0Ed2rarCPPgIl8w" fontName="Arial"/> - <styles xmi:type="notation:LineStyle" xmi:id="_YRv6E2o0Ed2rarCPPgIl8w" lineColor="0"/> - <element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_YRqagWo0Ed2rarCPPgIl8w"/> - <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YRv6FGo0Ed2rarCPPgIl8w" points="[24, 1, -218, -1]$[243, -13, 1, -15]"/> - </edges> <edges xmi:type="notation:Edge" xmi:id="_YxWnMGo0Ed2rarCPPgIl8w" type="3001" source="_FY--4GOSEd2mS_8SFTXMeQ" target="_EPve4GOSEd2mS_8SFTXMeQ"> <children xmi:type="notation:Node" xmi:id="_YxXOQGo0Ed2rarCPPgIl8w" type="4012"> <styles xmi:type="notation:FillStyle" xmi:id="_YxXOQWo0Ed2rarCPPgIl8w" fillColor="16776959"/> @@ -90,4 +78,16 @@ <element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_ZZSw8Wo0Ed2rarCPPgIl8w"/> <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZZT_FGo0Ed2rarCPPgIl8w" points="[15, -5, -199, 57]$[198, -53, -16, 9]"/> </edges> + <edges xmi:type="notation:Edge" xmi:id="_8DsgsHBZEd26O4vNTVSBiw" type="3001" source="_EPve4GOSEd2mS_8SFTXMeQ" target="_7UJTEHBZEd26O4vNTVSBiw"> + <children xmi:type="notation:Node" xmi:id="_8DtHwHBZEd26O4vNTVSBiw" type="4012"> + <styles xmi:type="notation:FillStyle" xmi:id="_8DtHwXBZEd26O4vNTVSBiw" fillColor="16776959"/> + <styles xmi:type="notation:LineStyle" xmi:id="_8DtHwnBZEd26O4vNTVSBiw" lineColor="16776959"/> + <layoutConstraint xmi:type="notation:Location" xmi:id="_8DtHw3BZEd26O4vNTVSBiw" y="40"/> + </children> + <styles xmi:type="notation:RoutingStyle" xmi:id="_8DsgsXBZEd26O4vNTVSBiw" routing="Rectilinear" smoothness="Normal" closestDistance="true"/> + <styles xmi:type="notation:FontStyle" xmi:id="_8DsgsnBZEd26O4vNTVSBiw" fontName="Arial"/> + <styles xmi:type="notation:LineStyle" xmi:id="_8Dsgs3BZEd26O4vNTVSBiw" lineColor="0"/> + <element xmi:type="bpmn:SequenceEdge" href="pattern-control-synchronization.bpmn#_8DqrgXBZEd26O4vNTVSBiw"/> + <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8DsgtHBZEd26O4vNTVSBiw" points="[24, -1, -74, -3]$[83, -5, -15, -7]"/> + </edges> </notation:Diagram> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/control/synchronization/pattern-control-synchronization.png =================================================================== (Binary files differ) Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/casedata/pattern-data-casedata-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -1,9 +1,5 @@ <ns2:process name="CaseData" xmlns:ns2="urn:bpm.jboss:pdl-0.1"> <start name="Start"> - <assignment time="Start"> - <from lang="MVEL">CaseData_foo</from> - <to>foo</to> - </assignment> <seqflow to="TaskA" /> </start> <task taskType="None" name="TaskA"> @@ -14,10 +10,14 @@ <messageRef nameRef="EndMessage" /> </message-result> </end> + <assignment time="Start"> + <from lang="MVEL">CaseData_foo</from> + <to>propValue</to> + </assignment> <message name="EndMessage"> - <to>jboss.bpm:test=CaseDataDescriptorTest</to> + <to>jboss.bpm:test=CaseDataTest</to> <property correlation="true"> - <name>foo</name> + <name>propValue</name> </property> </message> <property> Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/resources/pattern/data/taskdata/pattern-data-taskdata-api10.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -19,7 +19,7 @@ </message-result> </end> <message name="EndMessage"> - <to>jboss.bpm:test=TaskDataDescriptorTest</to> + <to>jboss.bpm:test=TaskDataTest</to> <property correlation="true"> <name>foo</name> </property> Modified: jbossbpm/spec/trunk/pom.xml =================================================================== --- jbossbpm/spec/trunk/pom.xml 2008-08-22 15:26:15 UTC (rev 1986) +++ jbossbpm/spec/trunk/pom.xml 2008-08-22 18:56:09 UTC (rev 1987) @@ -157,10 +157,6 @@ <configuration> <systemProperties> <property> - <name>jbpm.dialect</name> - <value>api10</value> - </property> - <property> <name>log4j.output.dir</name> <value>${project.build.directory}</value> </property>