more bpmn-stuff

diff --git a/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn b/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
index 9d95c891e42b87ef1c4288fb186d266b2388ae0d..7cefa39fe155e6dade98b51b7d0b010e762b2cb2 100644 (file)
--- a/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
+++ b/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
@@ -4,41 +4,11 @@
     <bpmn:participant id="Participant_0gzc3m9" name="Sentiment Analysis" processRef="Process_1" />
   </bpmn:collaboration>
   <bpmn:process id="Process_1" isExecutable="true">
-    <bpmn:laneSet id="LaneSet_1u08y0e">
-      <bpmn:lane id="Lane_1b2gu73" name="Failover (Stage 2)">
-        <bpmn:documentation>Stage 2</bpmn:documentation>
-        <bpmn:flowNodeRef>Task_05u1qwp</bpmn:flowNodeRef>
-      </bpmn:lane>
-      <bpmn:lane id="Lane_1stnhfw" name="Services">
-        <bpmn:flowNodeRef>Task_1rt5mbt</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Task_1n6iu8h</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Task_1cfglzc</bpmn:flowNodeRef>
-      </bpmn:lane>
-      <bpmn:lane id="Lane_07tjk3y" name="Flow">
-        <bpmn:flowNodeRef>Task_1kanz3j</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Task_0fs65yp</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Task_1tosag4</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>EndEvent_0bmuv13</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>StartEvent_1t6nxib</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>ExclusiveGateway_0onybdl</bpmn:flowNodeRef>
-      </bpmn:lane>
-    </bpmn:laneSet>
-    <bpmn:sequenceFlow id="SequenceFlow_0utq8ut" sourceRef="Task_05u1qwp" targetRef="Task_1rt5mbt" />
-    <bpmn:sequenceFlow id="SequenceFlow_1xc6g12" sourceRef="Task_05u1qwp" targetRef="Task_1cfglzc" />
-    <bpmn:sequenceFlow id="SequenceFlow_0azrswq" sourceRef="Task_05u1qwp" targetRef="Task_1n6iu8h" />
-    <bpmn:sequenceFlow id="SequenceFlow_03ohp0o" sourceRef="Task_1tosag4" targetRef="Task_1n6iu8h" />
-    <bpmn:sequenceFlow id="SequenceFlow_0okj60f" sourceRef="ExclusiveGateway_0onybdl" targetRef="Task_1tosag4">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">len(terms) == 0</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="SequenceFlow_1a5mps5" sourceRef="Task_1kanz3j" targetRef="Task_1rt5mbt" />
+    <bpmn:laneSet id="LaneSet_1u08y0e" />
     <bpmn:subProcess id="Task_1rt5mbt" name="Twitter Service">
       <bpmn:incoming>SequenceFlow_0utq8ut</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_1a5mps5</bpmn:incoming>
     </bpmn:subProcess>
-    <bpmn:subProcess id="Task_1n6iu8h" name="Report Service">
-      <bpmn:incoming>SequenceFlow_0azrswq</bpmn:incoming>
-      <bpmn:incoming>SequenceFlow_03ohp0o</bpmn:incoming>
-    </bpmn:subProcess>
     <bpmn:subProcess id="Task_05u1qwp" name="Fallback Service">
       <bpmn:outgoing>SequenceFlow_0utq8ut</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_1xc6g12</bpmn:outgoing>
@@ -54,7 +24,6 @@
         <bpmn:targetRef>Property_0qnzisj</bpmn:targetRef>
       </bpmn:dataInputAssociation>
     </bpmn:task>
-    <bpmn:sequenceFlow id="SequenceFlow_10v2c9r" sourceRef="ExclusiveGateway_0onybdl" targetRef="Task_1kanz3j" />
     <bpmn:task id="Task_0fs65yp" name="Analyze">
       <bpmn:incoming>SequenceFlow_1gbx7mw</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0azv06r</bpmn:outgoing>
@@ -64,18 +33,6 @@
       <bpmn:incoming>SequenceFlow_1xc6g12</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0azv06r</bpmn:incoming>
     </bpmn:subProcess>
-    <bpmn:task id="Task_1tosag4" name="Generate Report">
-      <bpmn:incoming>SequenceFlow_0okj60f</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_03ohp0o</bpmn:outgoing>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_0iwh0gi">
-        <bpmn:targetRef>DataObjectReference_10ouwro</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_1ustd8r">
-        <bpmn:targetRef>DataObjectReference_10ouwro</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-    </bpmn:task>
-    <bpmn:dataObjectReference id="DataObjectReference_10ouwro" name="&#60;output&#62;&#10;report" dataObjectRef="DataObject_1aetk4r" />
-    <bpmn:dataObject id="DataObject_1aetk4r" />
     <bpmn:endEvent id="EndEvent_0bmuv13">
       <bpmn:property id="Property_00nk8ci" name="__targetRef_placeholder" />
       <bpmn:dataInputAssociation id="DataInputAssociation_1mm9v77">
@@ -83,7 +40,6 @@
         <bpmn:targetRef>Property_00nk8ci</bpmn:targetRef>
       </bpmn:dataInputAssociation>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_0azv06r" sourceRef="Task_0fs65yp" targetRef="Task_1cfglzc" />
     <bpmn:startEvent id="StartEvent_1t6nxib" camunda:formKey="terms">
       <bpmn:extensionElements>
         <camunda:formData>
@@ -94,8 +50,6 @@
         <bpmn:targetRef>DataObjectReference_1paeomp</bpmn:targetRef>
       </bpmn:dataOutputAssociation>
     </bpmn:startEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1gbx7mw" sourceRef="Task_1kanz3j" targetRef="Task_0fs65yp" />
-    <bpmn:sequenceFlow id="SequenceFlow_032ipyi" sourceRef="Task_0fs65yp" targetRef="ExclusiveGateway_0onybdl" />
     <bpmn:dataObjectReference id="DataObjectReference_1paeomp" name="&#60;input&#62;&#10;terms" dataObjectRef="DataObject_0mtrivu" />
     <bpmn:dataObject id="DataObject_0mtrivu" />
     <bpmn:exclusiveGateway id="ExclusiveGateway_0onybdl">
@@ -103,141 +57,150 @@
       <bpmn:outgoing>SequenceFlow_0okj60f</bpmn:outgoing>
       <bpmn:outgoing>SequenceFlow_10v2c9r</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:association id="Association_1ukj08x" sourceRef="Lane_07tjk3y" targetRef="TextAnnotation_1qbyziq" />
-    <bpmn:textAnnotation id="TextAnnotation_1qbyziq">
-      <bpmn:text>All terms are analyzed</bpmn:text>
-    </bpmn:textAnnotation>
+    <bpmn:sequenceFlow id="SequenceFlow_032ipyi" sourceRef="Task_0fs65yp" targetRef="ExclusiveGateway_0onybdl" />
+    <bpmn:sequenceFlow id="SequenceFlow_1gbx7mw" sourceRef="Task_1kanz3j" targetRef="Task_0fs65yp" />
+    <bpmn:sequenceFlow id="SequenceFlow_0azv06r" sourceRef="Task_0fs65yp" targetRef="Task_1cfglzc" />
+    <bpmn:sequenceFlow id="SequenceFlow_10v2c9r" sourceRef="ExclusiveGateway_0onybdl" targetRef="Task_1kanz3j" />
+    <bpmn:sequenceFlow id="SequenceFlow_1a5mps5" sourceRef="Task_1kanz3j" targetRef="Task_1rt5mbt" />
+    <bpmn:sequenceFlow id="SequenceFlow_0okj60f" name="All terms are analyzed" sourceRef="ExclusiveGateway_0onybdl" targetRef="Task_1tosag4">
+      <bpmn:documentation>All terms are analyzed</bpmn:documentation>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${terms}==[]</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="SequenceFlow_03ohp0o" sourceRef="Task_1tosag4" targetRef="Task_1n6iu8h" />
+    <bpmn:sequenceFlow id="SequenceFlow_0azrswq" sourceRef="Task_05u1qwp" targetRef="Task_1n6iu8h" />
+    <bpmn:sequenceFlow id="SequenceFlow_1xc6g12" sourceRef="Task_05u1qwp" targetRef="Task_1cfglzc" />
+    <bpmn:sequenceFlow id="SequenceFlow_0utq8ut" sourceRef="Task_05u1qwp" targetRef="Task_1rt5mbt" />
+    <bpmn:dataObjectReference id="DataObjectReference_10ouwro" name="&#60;output&#62;&#10;report" dataObjectRef="DataObject_1aetk4r" />
+    <bpmn:dataObject id="DataObject_1aetk4r" />
+    <bpmn:task id="Task_1tosag4" name="Generate Report">
+      <bpmn:incoming>SequenceFlow_0okj60f</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_03ohp0o</bpmn:outgoing>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_0iwh0gi">
+        <bpmn:targetRef>DataObjectReference_10ouwro</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_1ustd8r">
+        <bpmn:targetRef>DataObjectReference_10ouwro</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+    </bpmn:task>
+    <bpmn:subProcess id="Task_1n6iu8h" name="Report Service">
+      <bpmn:incoming>SequenceFlow_0azrswq</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_03ohp0o</bpmn:incoming>
+    </bpmn:subProcess>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1x8eoy3">
       <bpmndi:BPMNShape id="Participant_0gzc3m9_di" bpmnElement="Participant_0gzc3m9">
-        <dc:Bounds x="-3.5" y="-254.5" width="1147" height="543" />
+        <dc:Bounds x="-2" y="-248" width="1147" height="543" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_06upc1d_di" bpmnElement="Task_05u1qwp">
-        <dc:Bounds x="621" y="-202" width="100" height="80" />
+        <dc:Bounds x="622" y="-196" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_0sbp815_di" bpmnElement="Task_1n6iu8h" isExpanded="false">
-        <dc:Bounds x="772" y="-31" width="100" height="80" />
+        <dc:Bounds x="830" y="-25" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_13bf266_di" bpmnElement="Task_1cfglzc">
-        <dc:Bounds x="464" y="-31" width="100" height="80" />
+        <dc:Bounds x="465" y="-25" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_0z94igi_di" bpmnElement="Task_1rt5mbt">
-        <dc:Bounds x="281" y="-31" width="100" height="80" />
+        <dc:Bounds x="282" y="-25" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0bmuv13_di" bpmnElement="EndEvent_0bmuv13">
-        <dc:Bounds x="1084" y="168" width="36" height="36" />
+        <dc:Bounds x="1085" y="174" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_10ouwro_di" bpmnElement="DataObjectReference_10ouwro">
-        <dc:Bounds x="961" y="161" width="36" height="50" />
+        <dc:Bounds x="992" y="167" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="958" y="218" width="44" height="27" />
+          <dc:Bounds x="989" y="224" width="44" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataInputAssociation_1mm9v77_di" bpmnElement="DataInputAssociation_1mm9v77">
-        <di:waypoint x="997" y="186" />
-        <di:waypoint x="1084" y="186" />
+        <di:waypoint x="1028" y="192" />
+        <di:waypoint x="1085" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Task_1tosag4_di" bpmnElement="Task_1tosag4">
-        <dc:Bounds x="772" y="146" width="100" height="80" />
+        <dc:Bounds x="830" y="152" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataOutputAssociation_0iwh0gi_di" bpmnElement="DataOutputAssociation_0iwh0gi">
-        <di:waypoint x="872" y="186" />
-        <di:waypoint x="961" y="186" />
+        <di:waypoint x="930" y="192" />
+        <di:waypoint x="992" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_1ustd8r_di" bpmnElement="DataOutputAssociation_1ustd8r">
-        <di:waypoint x="872" y="186" />
-        <di:waypoint x="961" y="186" />
+        <di:waypoint x="930" y="192" />
+        <di:waypoint x="992" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Task_0fs65yp_di" bpmnElement="Task_0fs65yp">
-        <dc:Bounds x="464" y="146" width="100" height="80" />
+        <dc:Bounds x="465" y="152" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Task_1kanz3j_di" bpmnElement="Task_1kanz3j">
-        <dc:Bounds x="281" y="146" width="100" height="80" />
+        <dc:Bounds x="282" y="152" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_1paeomp_di" bpmnElement="DataObjectReference_1paeomp">
-        <dc:Bounds x="179" y="161" width="36" height="50" />
+        <dc:Bounds x="180" y="167" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="179" y="218" width="37" height="27" />
+          <dc:Bounds x="180" y="224" width="37" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataInputAssociation_0qg613d_di" bpmnElement="DataInputAssociation_0qg613d">
-        <di:waypoint x="215" y="186" />
-        <di:waypoint x="281" y="186" />
+        <di:waypoint x="216" y="192" />
+        <di:waypoint x="282" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="StartEvent_1t6nxib_di" bpmnElement="StartEvent_1t6nxib">
-        <dc:Bounds x="70" y="168" width="36" height="36" />
+        <dc:Bounds x="71" y="174" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataOutputAssociation_1u87f7i_di" bpmnElement="DataOutputAssociation_1u87f7i">
-        <di:waypoint x="106" y="186" />
-        <di:waypoint x="179" y="186" />
+        <di:waypoint x="107" y="192" />
+        <di:waypoint x="180" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0utq8ut_di" bpmnElement="SequenceFlow_0utq8ut">
-        <di:waypoint x="621" y="-162" />
-        <di:waypoint x="331" y="-162" />
-        <di:waypoint x="331" y="-31" />
+        <di:waypoint x="622" y="-156" />
+        <di:waypoint x="332" y="-156" />
+        <di:waypoint x="332" y="-25" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1xc6g12_di" bpmnElement="SequenceFlow_1xc6g12">
-        <di:waypoint x="621" y="-162" />
-        <di:waypoint x="514" y="-162" />
-        <di:waypoint x="514" y="-31" />
+        <di:waypoint x="622" y="-156" />
+        <di:waypoint x="515" y="-156" />
+        <di:waypoint x="515" y="-25" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0azrswq_di" bpmnElement="SequenceFlow_0azrswq">
-        <di:waypoint x="721" y="-162" />
-        <di:waypoint x="822" y="-162" />
-        <di:waypoint x="822" y="-31" />
+        <di:waypoint x="722" y="-156" />
+        <di:waypoint x="880" y="-156" />
+        <di:waypoint x="880" y="-25" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_03ohp0o_di" bpmnElement="SequenceFlow_03ohp0o">
-        <di:waypoint x="822" y="146" />
-        <di:waypoint x="822" y="49" />
+        <di:waypoint x="880" y="152" />
+        <di:waypoint x="880" y="55" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0okj60f_di" bpmnElement="SequenceFlow_0okj60f">
-        <di:waypoint x="696" y="186" />
-        <di:waypoint x="772" y="186" />
+        <di:waypoint x="697" y="192" />
+        <di:waypoint x="830" y="192" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="728" y="168" width="12" height="14" />
+          <dc:Bounds x="736" y="174" width="62" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1a5mps5_di" bpmnElement="SequenceFlow_1a5mps5">
-        <di:waypoint x="331" y="146" />
-        <di:waypoint x="331" y="49" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="TextAnnotation_1qbyziq_di" bpmnElement="TextAnnotation_1qbyziq">
-        <dc:Bounds x="691" y="240" width="95" height="39" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_1ukj08x_di" bpmnElement="Association_1ukj08x">
-        <di:waypoint x="739" y="199" />
-        <di:waypoint x="739" y="240" />
+        <di:waypoint x="332" y="152" />
+        <di:waypoint x="332" y="55" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="Lane_1b2gu73_di" bpmnElement="Lane_1b2gu73">
-        <dc:Bounds x="26.5" y="-254.5" width="1117" height="181" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Lane_1stnhfw_di" bpmnElement="Lane_1stnhfw">
-        <dc:Bounds x="26.5" y="-73.5" width="1117" height="181" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Lane_07tjk3y_di" bpmnElement="Lane_07tjk3y">
-        <dc:Bounds x="26.5" y="107.5" width="1117" height="181" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_10v2c9r_di" bpmnElement="SequenceFlow_10v2c9r">
-        <di:waypoint x="671" y="211" />
-        <di:waypoint x="671" y="260" />
-        <di:waypoint x="331" y="260" />
-        <di:waypoint x="331" y="226" />
+        <di:waypoint x="672" y="217" />
+        <di:waypoint x="672" y="266" />
+        <di:waypoint x="332" y="266" />
+        <di:waypoint x="332" y="232" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0azv06r_di" bpmnElement="SequenceFlow_0azv06r">
-        <di:waypoint x="514" y="146" />
-        <di:waypoint x="514" y="49" />
+        <di:waypoint x="515" y="152" />
+        <di:waypoint x="515" y="55" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1gbx7mw_di" bpmnElement="SequenceFlow_1gbx7mw">
-        <di:waypoint x="381" y="186" />
-        <di:waypoint x="464" y="186" />
+        <di:waypoint x="382" y="192" />
+        <di:waypoint x="465" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_032ipyi_di" bpmnElement="SequenceFlow_032ipyi">
-        <di:waypoint x="564" y="186" />
-        <di:waypoint x="646" y="186" />
+        <di:waypoint x="565" y="192" />
+        <di:waypoint x="647" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_0pzjnfx_di" bpmnElement="ExclusiveGateway_0onybdl" isMarkerVisible="true">
-        <dc:Bounds x="646" y="161" width="50" height="50" />
+        <dc:Bounds x="647" y="167" width="50" height="50" />
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>