[jbpm-commits] JBoss JBPM SVN: r4285 - in jbpm4/trunk/modules: examples/src/test/resources/org/jbpm/examples/task and 5 other directories.

Author: koen.aers(a)jboss.com Date: 2009-03-19 00:51:05 -0400 (Thu, 19 Mar 2009) New Revision: 4285 Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/groups/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/groups/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/users/ Removed: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/ Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/users/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml Log: - adapted the jpdl.xsd - changed task examples according to the new xsd Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-03-18 17:13:10 UTC (rev 4284) +++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2009-03-19 04:51:05 UTC (rev 4285) @@ -315,10 +315,10 @@ </documentation></annotation> <complexType> <sequence> - <element ref="tns:assignment" minOccurs="0" maxOccurs="1" /> <element ref="tns:transition" minOccurs="0" maxOccurs="unbounded" /> </sequence> <attributeGroup ref="tns:activityAttributes" /> + <attributeGroup ref="tns:assignmentAttributes"/> </complexType> </element> @@ -574,6 +574,17 @@ </attribute> </attributeGroup> + <attributeGroup name="assignmentAttributes"> + <attribute name="assignee" type="string"> + </attribute> + <attribute name="candidate-groups" type="string"> + </attribute> + <attribute name="candidate-users" type="string"> + </attribute> + <attribute name="swimlane" type="string"> + </attribute> + </attributeGroup> + <complexType name="assignmentType"> <annotation><documentation>An element of type assignmentType will be used in tasks and swimlanes to specify to whom these respectively are assigned. @@ -610,10 +621,8 @@ <annotation><documentation>Elements of type swimlaneType will be used in the process to enumerate all the participating swimlanes. </documentation></annotation> - <sequence maxOccurs="1"> - <element ref="tns:assignment"/> - </sequence> <attribute name="name" type="string"/> + <attributeGroup ref="tns:assignmentAttributes"></attributeGroup> </complexType> <element name="swimlane" type="tns:swimlaneType"> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml 2009-03-18 17:13:10 UTC (rev 4284) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/assignee/process.jpdl.xml 2009-03-19 04:51:05 UTC (rev 4285) @@ -7,10 +7,10 @@ </start> <task name="review" + assignee="#{order.owner}" g="96,16,127,52"> - <assignment assignee="#{order.owner}" /> - - <transition to="wait" /> + + <transition to="wait" /> </task> <state name="wait" g="255,16,88,52"/> Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/groups/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/groups/process.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/groups/process.jpdl.xml 2009-03-19 04:51:05 UTC (rev 4285) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="TaskCandidateGroups"> + + <start g="20,20,48,48"> + <transition to="review" /> + </start> + + <task name="review" + candidate-groups="sales" + g="96,16,127,52"> + + <transition to="wait" /> + </task> + + <state name="wait" g="255,16,88,52"/> + +</process> Copied: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/users (from rev 4284, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates) Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/users/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-03-18 17:13:10 UTC (rev 4284) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidate/users/process.jpdl.xml 2009-03-19 04:51:05 UTC (rev 4285) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<process name="TaskCandidates"> +<process name="TaskCandidateUsers"> <start g="20,20,48,48"> <transition to="review" /> </start> - <task name="review" + <task name="review" + candidate-users="johndoe, joesmoe" g="96,16,127,52"> - <assignment candidates="johndoe, joesmoe" /> <transition to="wait" /> </task> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-03-18 17:13:10 UTC (rev 4284) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-03-19 04:51:05 UTC (rev 4285) @@ -2,21 +2,26 @@ <process name="swimlane" xmlns="http://jbpm.org/4/jpdl"> - <swimlane name="customer"> - <assignment assignee="john doe"/> + <swimlane name="customer" + assignee="johndoe"> </swimlane> <start g="20,20,48,48"> <transition to="open case" /> </start> - <task name="open case" g="96,16,127,52"> - <assignment swimlane="customer"/> + <task + name="open case" + swimlane="customer" + g="96,16,127,52"> + <transition to="verify"/> </task> - <task name="verify" g="255,16,88,52"> - <assignment swimlane="customer"/> + <task + name="verify" + swimlane="customer" + g="255,16,88,52"> </task> </process>