User: admin@spiffworkflow.org clicked save for misc/qa/bpmn-model-testing/composite-test-model-with-all-elements/composite-test-model-with-all-elements.bpmn

misc/qa/bpmn-model-testing/composite-test-model-with-all-elements/composite-test-model-with-all-elements.bpmn

@@ -35,7 +35,6 @@
         <bpmn:flowNodeRef>Activity_0456jk8</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_00q74af</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_12mvls1</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_1ul45i9</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0tbk5h1</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_08hxshg</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1gafp3e</bpmn:flowNodeRef>
@@ -46,6 +45,8 @@
         <bpmn:flowNodeRef>Event_0a7j0za</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_16y1ecr</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_148wg0d</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_1ul45i9</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_12kkvg2</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_194pd0d" name="Tester">
         <bpmn:flowNodeRef>Activity_15yuetc</bpmn:flowNodeRef>
@@ -123,7 +124,7 @@
           <spiffworkflow:property name="formUiSchemaFilename" value="review-form-uischema.json" />
         </spiffworkflow:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1xtmg0t</bpmn:incoming>
+      <bpmn:incoming>Flow_069gfag</bpmn:incoming>
       <bpmn:outgoing>Flow_10rvmdc</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:intermediateThrowEvent id="Event_0er19np" name="Reject">
@@ -235,7 +236,7 @@
     <bpmn:sequenceFlow id="Flow_042vla2" sourceRef="Gateway_1v7vc1z" targetRef="Gateway_1px4jo5">
       <bpmn:conditionExpression>approval == "Needmoreinfo"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_1xtmg0t" sourceRef="Activity_GetMoreData" targetRef="Activity_Review" />
+    <bpmn:sequenceFlow id="Flow_1xtmg0t" sourceRef="Activity_GetMoreData" targetRef="Activity_12kkvg2" />
     <bpmn:sequenceFlow id="Flow_10rvmdc" sourceRef="Activity_Review" targetRef="Gateway_1chm5qn" />
     <bpmn:sequenceFlow id="Flow_1efovhl" sourceRef="Gateway_1chm5qn" targetRef="Event_0t6257a">
       <bpmn:conditionExpression>approval == "Approve"</bpmn:conditionExpression>
@@ -344,9 +345,6 @@
       <bpmn:incoming>Flow_0l3zw86</bpmn:incoming>
       <bpmn:outgoing>Flow_12ty548</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
-    <bpmn:endEvent id="Event_1ul45i9" name="Cancelled&#10;">
-      <bpmn:incoming>Flow_07dk6k2</bpmn:incoming>
-    </bpmn:endEvent>
     <bpmn:callActivity id="Activity_0tbk5h1" name="Call Act with Script Task" calledElement="Unit_Test_Script_Task">
       <bpmn:incoming>Flow_1y73gxe</bpmn:incoming>
       <bpmn:outgoing>Flow_0v4e3o3</bpmn:outgoing>
@@ -851,6 +849,14 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
       <bpmn:incoming>Flow_15rbuvl</bpmn:incoming>
       <bpmn:outgoing>Flow_0vsn07x</bpmn:outgoing>
     </bpmn:callActivity>
+    <bpmn:endEvent id="Event_1ul45i9" name="Cancelled&#10;">
+      <bpmn:incoming>Flow_07dk6k2</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_069gfag" sourceRef="Activity_12kkvg2" targetRef="Activity_Review" />
+    <bpmn:manualTask id="Activity_12kkvg2" name="New Task">
+      <bpmn:incoming>Flow_1xtmg0t</bpmn:incoming>
+      <bpmn:outgoing>Flow_069gfag</bpmn:outgoing>
+    </bpmn:manualTask>
   </bpmn:process>
   <bpmn:signal id="check_balance" name="check_balance">
     <bpmn:extensionElements>
@@ -954,6 +960,16 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
         <dc:Bounds x="380" y="411" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1ul45i9_di" bpmnElement="Event_1ul45i9">
+        <dc:Bounds x="-109" y="594" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="-115" y="637" width="49" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1co7lpe_di" bpmnElement="Activity_12kkvg2">
+        <dc:Bounds x="-330" y="530" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1p6wtv8_di" bpmnElement="Activity_12t2hwu" isExpanded="true">
         <dc:Bounds x="1500" y="351" width="710" height="279" />
       </bpmndi:BPMNShape>
@@ -1019,12 +1035,6 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
           <dc:Bounds x="-36" y="550" width="76" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1ul45i9_di" bpmnElement="Event_1ul45i9">
-        <dc:Bounds x="-288" y="572" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="-294" y="615" width="49" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1wfldjw_di" bpmnElement="Activity_0tbk5h1">
         <dc:Bounds x="1350" y="411" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1399,8 +1409,10 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="-140" y="170" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1xtmg0t_di" bpmnElement="Flow_1xtmg0t">
-        <di:waypoint x="-299" y="451" />
+        <di:waypoint x="-349" y="491" />
-        <di:waypoint x="-249" y="451" />
+        <di:waypoint x="-349" y="511" />
+        <di:waypoint x="-310" y="511" />
+        <di:waypoint x="-310" y="530" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_10rvmdc_di" bpmnElement="Flow_10rvmdc">
         <di:waypoint x="-149" y="451" />
@@ -1423,9 +1435,7 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_07dk6k2_di" bpmnElement="Flow_07dk6k2">
         <di:waypoint x="-91" y="476" />
-        <di:waypoint x="-91" y="525" />
+        <di:waypoint x="-91" y="594" />
-        <di:waypoint x="-270" y="525" />
-        <di:waypoint x="-270" y="572" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_05xruvm_di" bpmnElement="Flow_05xruvm">
         <di:waypoint x="19" y="390" />
@@ -1722,6 +1732,11 @@ Data outa = {{DataOuta}}</spiffworkflow:instructionsForEndUser>
         <di:waypoint x="950" y="1350" />
         <di:waypoint x="1150" y="1350" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_069gfag_di" bpmnElement="Flow_069gfag">
+        <di:waypoint x="-230" y="570" />
+        <di:waypoint x="-199" y="570" />
+        <di:waypoint x="-199" y="491" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_16dsylz_di" bpmnElement="DataOutputAssociation_16dsylz">
         <di:waypoint x="2636" y="1020" />
         <di:waypoint x="2576" y="1205" />