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

Author: thomas.diesler(a)jboss.com Date: 2008-07-09 16:03:48 -0400 (Wed, 09 Jul 2008) New Revision: 1563 Added: api/trunk/docs/VioletUML/APIModel.class.violet api/trunk/docs/VioletUML/APIModel.png api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java Removed: api/trunk/docs/VioletUML/APIProcess.class.violet api/trunk/docs/VioletUML/APIProcess.png api/trunk/docs/VioletUML/APIRuntime.class.violet api/trunk/docs/VioletUML/APIRuntime.png api/trunk/modules/api/src/main/java/org/jboss/bpm/client/Attachments.java api/trunk/modules/api/src/main/java/org/jboss/bpm/client/BasicAttachments.java api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java Modified: api/trunk/docs/VioletUML/APIClient.class.violet api/trunk/docs/VioletUML/APIClient.png api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Result.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractEndEvent.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractProcess.java api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InitialToken.java api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java Log: Cleanup API Modified: api/trunk/docs/VioletUML/APIClient.class.violet =================================================================== --- api/trunk/docs/VioletUML/APIClient.class.violet 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/docs/VioletUML/APIClient.class.violet 2008-07-09 20:03:48 UTC (rev 1563) @@ -10,15 +10,15 @@ </void> <void property="name"> <void property="text"> - <string>ProcessDefinition + <string>Process </string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>520.0</double> - <double>151.0</double> + <double>462.0</double> + <double>48.0</double> </void> </object> </void> @@ -39,7 +39,7 @@ <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> <double>12.0</double> - <double>281.0</double> + <double>161.0</double> </void> </object> </void> @@ -47,62 +47,58 @@ <object id="ClassNode2" class="com.horstmann.violet.ClassNode"> <void property="methods"> <void property="text"> - <string>createProcessDefinition -findProcessDefinition -removeProcessDefinition</string> + <string>createProcess +findProcess +removeProcess</string> </void> </void> <void property="name"> <void property="text"> - <string>ProcessDefinitionManager</string> + <string>ProcessManager</string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>254.0</double> - <double>123.0</double> + <double>251.0</double> + <double>30.0</double> </void> </object> </void> <void method="addNode"> <object id="ClassNode3" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name -metadata</string> - </void> - </void> <void property="name"> <void property="text"> - <string>ProcessInstance</string> + <string>FlowObject</string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>521.0</double> - <double>292.0</double> + <double>622.0</double> + <double>54.0</double> </void> </object> </void> <void method="addNode"> <object id="ClassNode4" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> + <void property="methods"> <void property="text"> - <string>name</string> + <string>addListener +removeListener +throwSignal</string> </void> </void> <void property="name"> <void property="text"> - <string>Execution</string> + <string>SignalManager</string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>524.0</double> - <double>425.0</double> + <double>253.0</double> + <double>226.0</double> </void> </object> </void> @@ -110,40 +106,42 @@ <object id="ClassNode5" class="com.horstmann.violet.ClassNode"> <void property="methods"> <void property="text"> - <string>createProcessInstance -</string> + <string>catchSignal</string> </void> </void> <void property="name"> <void property="text"> - <string>ProcessInstanceManager</string> + <string>SignalListener</string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>253.0</double> - <double>288.0</double> + <double>245.0</double> + <double>380.0</double> </void> </object> </void> <void method="addNode"> <object id="ClassNode6" class="com.horstmann.violet.ClassNode"> - <void property="methods"> + <void property="attributes"> <void property="text"> - <string>createExecution</string> + <string>process +message +type +</string> </void> </void> <void property="name"> <void property="text"> - <string>ExecutionManager</string> + <string>Signal</string> </void> </void> </object> <object class="java.awt.geom.Point2D$Double"> <void method="setLocation"> - <double>250.0</double> - <double>416.0</double> + <double>404.0</double> + <double>230.0</double> </void> </object> </void> @@ -194,14 +192,11 @@ <void property="bentStyle"> <object class="com.horstmann.violet.BentStyle" field="HVH"/> </void> - <void property="endLabel"> - <string>0..*</string> - </void> <void property="startArrowHead"> <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> </void> </object> - <object idref="ClassNode3"/> + <object idref="ClassNode1"/> <object idref="ClassNode4"/> </void> <void method="connect"> @@ -209,23 +204,29 @@ <void property="bentStyle"> <object class="com.horstmann.violet.BentStyle" field="HVH"/> </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> </void> + <void property="endLabel"> + <string>0..*</string> + </void> </object> - <object idref="ClassNode1"/> + <object idref="ClassNode4"/> <object idref="ClassNode5"/> </void> <void method="connect"> <object class="com.horstmann.violet.ClassRelationshipEdge"> <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> + <object class="com.horstmann.violet.BentStyle" field="HV"/> </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> </void> + <void property="lineStyle"> + <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> + </void> </object> - <object idref="ClassNode1"/> + <object idref="ClassNode4"/> <object idref="ClassNode6"/> </void> </object> Modified: api/trunk/docs/VioletUML/APIClient.png =================================================================== (Binary files differ) Added: api/trunk/docs/VioletUML/APIModel.class.violet =================================================================== --- api/trunk/docs/VioletUML/APIModel.class.violet (rev 0) +++ api/trunk/docs/VioletUML/APIModel.class.violet 2008-07-09 20:03:48 UTC (rev 1563) @@ -0,0 +1,562 @@ +<?xml version="1.0" encoding="UTF-8"?> +<java version="1.6.0_06" class="java.beans.XMLDecoder"> + <object class="com.horstmann.violet.ClassDiagramGraph"> + <void method="addNode"> + <object id="ClassNode0" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>ExecutionContext</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>728.0</double> + <double>18.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode1" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Attachments</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>736.0</double> + <double>114.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode2" class="com.horstmann.violet.ClassNode"> + <void property="methods"> + <void property="text"> + <string>execute</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>FlowObject</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>351.0</double> + <double>20.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode3" class="com.horstmann.violet.ClassNode"> + <void property="methods"> + <void property="text"> + <string>startProcess</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>Process +</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>211.0</double> + <double>354.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode4" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Event</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>195.0</double> + <double>128.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode5" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>StartEvent</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>33.0</double> + <double>209.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode6" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>IntermediateEvent</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>9.0</double> + <double>134.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode7" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>EndEvent</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>27.0</double> + <double>302.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode8" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Activity</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>349.0</double> + <double>240.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode9" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Gateway +</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>496.0</double> + <double>133.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode10" class="com.horstmann.violet.ClassNode"> + <void property="attributes"> + <void property="text"> + <string>parent</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>SubProcess +</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>205.0</double> + <double>445.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode11" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Task</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>436.0</double> + <double>353.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode12" class="com.horstmann.violet.ClassNode"> + <void property="attributes"> + <void property="text"> + <string>process</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>Token</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>589.0</double> + <double>15.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode13" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>ExclusiveGateway</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>643.0</double> + <double>237.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode14" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>InclusiveGateway</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>636.0</double> + <double>306.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode15" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>ComplexGateway</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>636.0</double> + <double>376.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode16" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>ParallelGateway</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>639.0</double> + <double>446.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode17" class="com.horstmann.violet.ClassNode"> + <void property="attributes"> + <void property="text"> + <string>name</string> + </void> + </void> + <void property="name"> + <void property="text"> + <string>NamedFlowObject +</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>327.0</double> + <double>127.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode18" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Result</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>28.0</double> + <double>396.0</double> + </void> + </object> + </void> + <void method="addNode"> + <object id="ClassNode19" class="com.horstmann.violet.ClassNode"> + <void property="name"> + <void property="text"> + <string>Attachments</string> + </void> + </void> + </object> + <object class="java.awt.geom.Point2D$Double"> + <void method="setLocation"> + <double>29.0</double> + <double>490.0</double> + </void> + </object> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode5"/> + <object idref="ClassNode4"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode4"/> + <object idref="ClassNode2"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode6"/> + <object idref="ClassNode4"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode7"/> + <object idref="ClassNode4"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode9"/> + <object idref="ClassNode2"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode3"/> + <object idref="ClassNode8"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode10"/> + <object idref="ClassNode3"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode11"/> + <object idref="ClassNode8"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> + </void> + </object> + <object idref="ClassNode12"/> + <object idref="ClassNode0"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode0"/> + <object idref="ClassNode1"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode13"/> + <object idref="ClassNode9"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode14"/> + <object idref="ClassNode9"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode15"/> + <object idref="ClassNode9"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode16"/> + <object idref="ClassNode9"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode17"/> + <object idref="ClassNode2"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="VHV"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> + </void> + </object> + <object idref="ClassNode8"/> + <object idref="ClassNode17"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> + </void> + </object> + <object idref="ClassNode7"/> + <object idref="ClassNode18"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> + </void> + </object> + <object idref="ClassNode2"/> + <object idref="ClassNode12"/> + </void> + <void method="connect"> + <object class="com.horstmann.violet.ClassRelationshipEdge"> + <void property="bentStyle"> + <object class="com.horstmann.violet.BentStyle" field="HVH"/> + </void> + <void property="endArrowHead"> + <object class="com.horstmann.violet.ArrowHead" field="V"/> + </void> + </object> + <object idref="ClassNode18"/> + <object idref="ClassNode19"/> + </void> + </object> +</java> Added: api/trunk/docs/VioletUML/APIModel.png =================================================================== (Binary files differ) Property changes on: api/trunk/docs/VioletUML/APIModel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: api/trunk/docs/VioletUML/APIProcess.class.violet =================================================================== --- api/trunk/docs/VioletUML/APIProcess.class.violet 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/docs/VioletUML/APIProcess.class.violet 2008-07-09 20:03:48 UTC (rev 1563) @@ -1,329 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.6.0_06" class="java.beans.XMLDecoder"> - <object class="com.horstmann.violet.ClassDiagramGraph"> - <void method="addNode"> - <object id="ClassNode0" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="methods"> - <void property="text"> - <string>createProcessInstance -findProcessInstance -removeProcessInstance</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>ProcessDefinition -</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>162.0</double> - <double>210.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode1" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Node</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>394.0</double> - <double>232.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode2" class="com.horstmann.violet.ClassNode"> - <void property="name"> - <void property="text"> - <string>StartNode -</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>304.0</double> - <double>69.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode3" class="com.horstmann.violet.ClassNode"> - <void property="name"> - <void property="text"> - <string>EndNode</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>470.0</double> - <double>74.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode4" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="methods"> - <void property="text"> - <string>createExecution -findExecution -removeExecution</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>ProcessInstance</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>170.0</double> - <double>362.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode5" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="methods"> - <void property="text"> - <string>signal()</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Execution</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>388.0</double> - <double>377.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="NoteNode0" class="com.horstmann.violet.NoteNode"> - <void property="text"> - <void property="text"> - <string>The client signals the -Excecution without -parameters. </string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>437.0</double> - <double>491.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode6" class="com.horstmann.violet.ClassNode"> - <void property="name"> - <void property="text"> - <string>ExecutionContext</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>547.0</double> - <double>375.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode7" class="com.horstmann.violet.ClassNode"> - <void property="name"> - <void property="text"> - <string>Attachments</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>9.0</double> - <double>371.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode8" class="com.horstmann.violet.ClassNode"> - <void property="name"> - <void property="text"> - <string>Attachments</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>550.0</double> - <double>270.0</double> - </void> - </object> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endLabel"> - <string>1..*</string> - </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> - </void> - </object> - <object idref="ClassNode0"/> - <object idref="ClassNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> - </void> - </object> - <object idref="ClassNode2"/> - <object idref="ClassNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> - </void> - </object> - <object idref="ClassNode3"/> - <object idref="ClassNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="endLabel"> - <string>current</string> - </void> - </object> - <object idref="ClassNode5"/> - <object idref="ClassNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endLabel"> - <string>0..*</string> - </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> - </void> - </object> - <object idref="ClassNode0"/> - <object idref="ClassNode4"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endLabel"> - <string>0..*</string> - </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> - </void> - </object> - <object idref="ClassNode4"/> - <object idref="ClassNode5"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.NoteEdge"/> - <object idref="ClassNode5"/> - <object idref="NoteNode0"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> - </void> - <void property="lineStyle"> - <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> - </void> - </object> - <object idref="ClassNode4"/> - <object idref="ClassNode7"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="startArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="DIAMOND"/> - </void> - </object> - <object idref="ClassNode5"/> - <object idref="ClassNode6"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> - </void> - <void property="lineStyle"> - <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> - </void> - </object> - <object idref="ClassNode6"/> - <object idref="ClassNode8"/> - </void> - </object> -</java> Deleted: api/trunk/docs/VioletUML/APIProcess.png =================================================================== (Binary files differ) Deleted: api/trunk/docs/VioletUML/APIRuntime.class.violet =================================================================== --- api/trunk/docs/VioletUML/APIRuntime.class.violet 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/docs/VioletUML/APIRuntime.class.violet 2008-07-09 20:03:48 UTC (rev 1563) @@ -1,330 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java version="1.6.0_06" class="java.beans.XMLDecoder"> - <object class="com.horstmann.violet.ClassDiagramGraph"> - <void method="addNode"> - <object id="ClassNode0" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="methods"> - <void property="text"> - <string>signal(name)</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>RuntimeExecution</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>172.0</double> - <double>355.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode1" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>RuntimeNode</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>171.0</double> - <double>243.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode2" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Transition</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>12.0</double> - <double>241.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode3" class="com.horstmann.violet.ClassNode"> - <void property="methods"> - <void property="text"> - <string>execute</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Activity</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>397.0</double> - <double>209.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode4" class="com.horstmann.violet.ClassNode"> - <void property="methods"> - <void property="text"> - <string>choosePath</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>TransitionRouter</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>395.0</double> - <double>297.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="NoteNode0" class="com.horstmann.violet.NoteNode"> - <void property="text"> - <void property="text"> - <string>Executes business logic. -Has access to the execution -context, but not the definition.</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>291.0</double> - <double>100.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="NoteNode1" class="com.horstmann.violet.NoteNode"> - <void property="text"> - <void property="text"> - <string>Chooses the leaving -Transition.</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>459.0</double> - <double>415.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode5" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string> -</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>ExecutionContext</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>562.0</double> - <double>254.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode6" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Node</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>559.0</double> - <double>163.0</double> - </void> - </object> - </void> - <void method="addNode"> - <object id="ClassNode7" class="com.horstmann.violet.ClassNode"> - <void property="attributes"> - <void property="text"> - <string>name</string> - </void> - </void> - <void property="methods"> - <void property="text"> - <string>signal()</string> - </void> - </void> - <void property="name"> - <void property="text"> - <string>Execution</string> - </void> - </void> - </object> - <object class="java.awt.geom.Point2D$Double"> - <void method="setLocation"> - <double>16.0</double> - <double>356.0</double> - </void> - </object> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="endLabel"> - <string>current</string> - </void> - </object> - <object idref="ClassNode0"/> - <object idref="ClassNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="endLabel"> - <string>0..*</string> - </void> - </object> - <object idref="ClassNode1"/> - <object idref="ClassNode2"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - </object> - <object idref="ClassNode1"/> - <object idref="ClassNode3"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - </object> - <object idref="ClassNode1"/> - <object idref="ClassNode4"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="lineStyle"> - <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> - </void> - </object> - <object idref="ClassNode4"/> - <object idref="ClassNode0"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.NoteEdge"/> - <object idref="ClassNode3"/> - <object idref="NoteNode0"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.NoteEdge"/> - <object idref="ClassNode4"/> - <object idref="NoteNode1"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="lineStyle"> - <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> - </void> - </object> - <object idref="ClassNode3"/> - <object idref="ClassNode5"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="HVH"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="V"/> - </void> - <void property="lineStyle"> - <object class="com.horstmann.violet.LineStyle" field="DOTTED"/> - </void> - </object> - <object idref="ClassNode3"/> - <object idref="ClassNode6"/> - </void> - <void method="connect"> - <object class="com.horstmann.violet.ClassRelationshipEdge"> - <void property="bentStyle"> - <object class="com.horstmann.violet.BentStyle" field="VHV"/> - </void> - <void property="endArrowHead"> - <object class="com.horstmann.violet.ArrowHead" field="TRIANGLE"/> - </void> - </object> - <object idref="ClassNode0"/> - <object idref="ClassNode7"/> - </void> - </object> -</java> Deleted: api/trunk/docs/VioletUML/APIRuntime.png =================================================================== (Binary files differ) Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/Attachments.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/Attachments.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/Attachments.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -1,134 +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.client; - -//$Id$ - -import java.util.Collection; - -/** - * An interface for general Attachments - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Attachments -{ - /** Get attachment keys */ - Collection<Key> getAttachmentKeys(); - - /** Add arbitrary attachment */ - <T> T addAttachment(Class<T> clazz, Object value); - - /** Add arbitrary attachment with name */ - <T> T addAttachment(Class<T> clazz, String name, Object value); - - /** Add arbitrary attachment with name */ - <T> T addAttachment(String name, Object value); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> clazz, String name); - - /** Get an arbitrary attachment */ - <T> T getAttachment(String name); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> clazz, String name); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(String name); - - /** - * A key for attachements - */ - public static class Key - { - private Class<?> clazz; - private String name; - - /** - * Construct the key with optional class and name - */ - public Key(Class<?> clazz, String name) - { - this.clazz = clazz; - this.name = name; - } - - /** - * Get the class part for this key - * - * @return maybe null - */ - public Class<?> getClassPart() - { - return clazz; - } - - /** - * Get the name part for this key - * - * @return maybe null - */ - public String getNamePart() - { - return name; - } - - /** - * Two keys are equal if their {@link #toString()} is equal - */ - public boolean equals(Object obj) - { - if (!(obj instanceof Key)) - return false; - if (obj == this) - return true; - return obj.toString().equals(toString()); - } - - /** - * Two keys have the same hashCode if their {@link #toString()} is equal - */ - public int hashCode() - { - return toString().hashCode(); - } - - /** - * Returns the String repesentation of this Key. <p/> - * <pre> - * "[" + clazz + "," + name + "]" - * </pre> - */ - public String toString() - { - return "[" + (clazz != null ? clazz.getName() : null) + "," + name + "]"; - } - } -} \ No newline at end of file Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/BasicAttachments.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/BasicAttachments.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/BasicAttachments.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -1,118 +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.client; - -//$Id$ - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - - -/** - * Basic attachments. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicAttachments implements Attachments -{ - private Map<Key, Object> attachments = new HashMap<Key, Object>(); - - /** Construct the execution context with no attachments */ - public BasicAttachments() - { - - } - - /** Construct the execution context with given attachments */ - public BasicAttachments(Attachments att) - { - if (att != null) - { - for (Key key : att.getAttachmentKeys()) - { - Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); - this.attachments.put(key, value); - } - } - } - - public Collection<Key> getAttachmentKeys() - { - return attachments.keySet(); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz) - { - return (T)attachments.get(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(Class<T> clazz, String name) - { - return (T)attachments.get(new Key(clazz, name)); - } - - @SuppressWarnings("unchecked") - public <T> T getAttachment(String name) - { - return (T)attachments.get(new Key(null, name)); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, Object obj) - { - return (T)attachments.put(new Key(clazz, null), obj); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(Class<T> clazz, String name, Object obj) - { - return (T)attachments.put(new Key(clazz, name), obj); - } - - @SuppressWarnings("unchecked") - public <T> T addAttachment(String name, Object obj) - { - return (T)attachments.put(new Key(null, name), obj); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz) - { - return (T)attachments.remove(new Key(clazz, null)); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(Class<T> clazz, String name) - { - return (T)attachments.remove(new Key(clazz, name)); - } - - @SuppressWarnings("unchecked") - public <T> T removeAttachment(String name) - { - return (T)attachments.remove(new Key(null, name)); - } -} Deleted: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -1,38 +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.client; - -//$Id$ - -import org.jboss.bpm.runtime.Signal; - -/** - * A signal listener that can be registered with the ProcessEngine - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface SignalListener -{ - /** Catch a signal from the process that this listener is registered with */ - void catchSignal(Signal signal); -} \ No newline at end of file Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalManager.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.bpm.runtime.Signal; +import org.jboss.bpm.runtime.SignalListener; /** * The signal manager is the entry point for signal processing Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.Future; -import org.jboss.bpm.client.Attachments; +import org.jboss.bpm.runtime.Attachments; // $Id$ @@ -35,7 +35,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface Process extends Activity, NamedFlowObject +public interface Process extends Activity { /** Start the process */ Future<Result> startProcess(); Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Result.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Result.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Result.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.bpm.client.Attachments; +import org.jboss.bpm.runtime.Attachments; /** * A Result is consequence of reaching an End Event. Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractEndEvent.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractEndEvent.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractEndEvent.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -23,9 +23,9 @@ // $Id$ -import org.jboss.bpm.client.Attachments; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.Result; +import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.Signal; import org.jboss.bpm.runtime.Token; Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractProcess.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractProcess.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/AbstractProcess.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -33,7 +33,6 @@ import org.jboss.bpm.InvalidProcessException; import org.jboss.bpm.NameNotUniqueException; import org.jboss.bpm.NotImplementedException; -import org.jboss.bpm.client.Attachments; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.model.EndEvent; import org.jboss.bpm.model.FlowObject; @@ -41,6 +40,7 @@ import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Result; import org.jboss.bpm.model.StartEvent; +import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.Signal; /** Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InitialToken.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InitialToken.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/internal/InitialToken.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -23,9 +23,9 @@ // $Id$ -import org.jboss.bpm.client.Attachments; -import org.jboss.bpm.client.BasicAttachments; import org.jboss.bpm.model.Process; +import org.jboss.bpm.runtime.Attachments; +import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.runtime.ExecutionContext; import org.jboss.bpm.runtime.Token; Copied: api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java (from rev 1561, api/trunk/modules/api/src/main/java/org/jboss/bpm/client/Attachments.java) =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java (rev 0) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/Attachments.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -0,0 +1,134 @@ +/* + * 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.runtime; + +//$Id$ + +import java.util.Collection; + +/** + * An interface for general Attachments + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Attachments +{ + /** Get attachment keys */ + Collection<Key> getAttachmentKeys(); + + /** Add arbitrary attachment */ + <T> T addAttachment(Class<T> clazz, Object value); + + /** Add arbitrary attachment with name */ + <T> T addAttachment(Class<T> clazz, String name, Object value); + + /** Add arbitrary attachment with name */ + <T> T addAttachment(String name, Object value); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> clazz, String name); + + /** Get an arbitrary attachment */ + <T> T getAttachment(String name); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> clazz, String name); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(String name); + + /** + * A key for attachements + */ + public static class Key + { + private Class<?> clazz; + private String name; + + /** + * Construct the key with optional class and name + */ + public Key(Class<?> clazz, String name) + { + this.clazz = clazz; + this.name = name; + } + + /** + * Get the class part for this key + * + * @return maybe null + */ + public Class<?> getClassPart() + { + return clazz; + } + + /** + * Get the name part for this key + * + * @return maybe null + */ + public String getNamePart() + { + return name; + } + + /** + * Two keys are equal if their {@link #toString()} is equal + */ + public boolean equals(Object obj) + { + if (!(obj instanceof Key)) + return false; + if (obj == this) + return true; + return obj.toString().equals(toString()); + } + + /** + * Two keys have the same hashCode if their {@link #toString()} is equal + */ + public int hashCode() + { + return toString().hashCode(); + } + + /** + * Returns the String repesentation of this Key. <p/> + * <pre> + * "[" + clazz + "," + name + "]" + * </pre> + */ + public String toString() + { + return "[" + (clazz != null ? clazz.getName() : null) + "," + name + "]"; + } + } +} \ No newline at end of file Copied: api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java (from rev 1561, api/trunk/modules/api/src/main/java/org/jboss/bpm/client/BasicAttachments.java) =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java (rev 0) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/BasicAttachments.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -0,0 +1,119 @@ +/* + * 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.runtime; + +//$Id$ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + + + +/** + * Basic attachments. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicAttachments implements Attachments +{ + private Map<Key, Object> attachments = new HashMap<Key, Object>(); + + /** Construct the execution context with no attachments */ + public BasicAttachments() + { + + } + + /** Construct the execution context with given attachments */ + public BasicAttachments(Attachments att) + { + if (att != null) + { + for (Key key : att.getAttachmentKeys()) + { + Object value = att.getAttachment(key.getClassPart(), key.getNamePart()); + this.attachments.put(key, value); + } + } + } + + public Collection<Key> getAttachmentKeys() + { + return attachments.keySet(); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(Class<T> clazz, String name) + { + return (T)attachments.get(new Key(clazz, name)); + } + + @SuppressWarnings("unchecked") + public <T> T getAttachment(String name) + { + return (T)attachments.get(new Key(null, name)); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(new Key(clazz, null), obj); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(Class<T> clazz, String name, Object obj) + { + return (T)attachments.put(new Key(clazz, name), obj); + } + + @SuppressWarnings("unchecked") + public <T> T addAttachment(String name, Object obj) + { + return (T)attachments.put(new Key(null, name), obj); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz) + { + return (T)attachments.remove(new Key(clazz, null)); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(Class<T> clazz, String name) + { + return (T)attachments.remove(new Key(clazz, name)); + } + + @SuppressWarnings("unchecked") + public <T> T removeAttachment(String name) + { + return (T)attachments.remove(new Key(null, name)); + } +} Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/ExecutionContext.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.bpm.client.Attachments; /** * An execution context that can take attachments. Copied: api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java (from rev 1561, api/trunk/modules/api/src/main/java/org/jboss/bpm/client/SignalListener.java) =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java (rev 0) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/runtime/SignalListener.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -0,0 +1,37 @@ +/* + * 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.runtime; + +//$Id$ + + +/** + * A signal listener that can be registered with the ProcessEngine + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface SignalListener +{ + /** Catch a signal from the process that this listener is registered with */ + void catchSignal(Signal signal); +} \ No newline at end of file Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java =================================================================== --- api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/api/src/main/java/org/jboss/bpm/test/DefaultEngineTestCase.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -29,9 +29,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.ProcessEngine; import org.jboss.bpm.runtime.Signal; +import org.jboss.bpm.runtime.SignalListener; public abstract class DefaultEngineTestCase extends AbstractAPITestCase implements SignalListener { Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java =================================================================== --- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/context/ExecutionContextTest.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -26,12 +26,12 @@ import java.net.URL; import java.util.concurrent.Future; -import org.jboss.bpm.client.Attachments; -import org.jboss.bpm.client.BasicAttachments; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Result; +import org.jboss.bpm.runtime.Attachments; +import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; /** Modified: api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java =================================================================== --- api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-09 19:14:53 UTC (rev 1562) +++ api/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-07-09 20:03:48 UTC (rev 1563) @@ -27,11 +27,11 @@ import java.util.List; import java.util.concurrent.Future; -import org.jboss.bpm.client.Attachments; import org.jboss.bpm.client.ProcessManager; import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.Result; +import org.jboss.bpm.runtime.Attachments; import org.jboss.bpm.runtime.Signal; import org.jboss.bpm.test.DefaultEngineTestCase;