syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdisabat...@apache.org
Subject [1/2] git commit: [SYNCOPE-569]
Date Fri, 17 Oct 2014 09:50:59 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 3ee04978c -> c005f7526


[SYNCOPE-569]


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/abfb8050
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/abfb8050
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/abfb8050

Branch: refs/heads/master
Commit: abfb80507484e0de6815a04e4a84e9e060888b72
Parents: 0b91bf2
Author: Marco Di Sabatino Di Diodoro <mdisabatino@apache.org>
Authored: Fri Oct 17 11:25:49 2014 +0200
Committer: Marco Di Sabatino Di Diodoro <mdisabatino@apache.org>
Committed: Fri Oct 17 11:25:49 2014 +0200

----------------------------------------------------------------------
 core/src/main/resources/userWorkflow.bpmn20.xml | 85 +++++++++++---------
 1 file changed, 48 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/abfb8050/core/src/main/resources/userWorkflow.bpmn20.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/userWorkflow.bpmn20.xml b/core/src/main/resources/userWorkflow.bpmn20.xml
index 613d7c0..510ce9f 100644
--- a/core/src/main/resources/userWorkflow.bpmn20.xml
+++ b/core/src/main/resources/userWorkflow.bpmn20.xml
@@ -31,7 +31,11 @@ under the License.
     <startEvent id="theStart"/>
     <sequenceFlow id="flow1" sourceRef="theStart" targetRef="create"/>
     <serviceTask id="create" name="Create" activiti:expression="#{create.execute(execution.processInstanceId)}"/>
-    <sequenceFlow id="sid-EA94A12A-727F-414B-9D7E-AC576B0D6FA8" sourceRef="create" targetRef="active"/>
+    <sequenceFlow id="flow2" sourceRef="create" targetRef="activate"/>
+    <scriptTask id="activate" name="Activate" scriptFormat="groovy" activiti:autoStoreVariables="false">
+      <script>execution.setVariable("propagateEnable", Boolean.TRUE);</script>
+    </scriptTask>
+    <sequenceFlow id="flow3" sourceRef="activate" targetRef="active"/>
     <userTask id="active" name="Active"/>
     <sequenceFlow id="flow8" sourceRef="active" targetRef="activeGw"/>
     <exclusiveGateway id="activeGw"/>
@@ -49,7 +53,7 @@ under the License.
     </sequenceFlow>
     <sequenceFlow id="active2ConfirmPasswordReset" sourceRef="activeGw" targetRef="checkToken4ConfirmPasswordReset">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${task == 'confirmPasswordReset'}]]></conditionExpression>
-    </sequenceFlow>    
+    </sequenceFlow>
     <serviceTask id="update" name="Update" activiti:expression="#{update.execute(execution.processInstanceId)}"/>
     <sequenceFlow id="sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C" sourceRef="update" targetRef="active"/>
     <serviceTask id="suspend" name="Suspend" activiti:expression="#{suspend.execute(execution.processInstanceId)}"/>
@@ -74,20 +78,20 @@ under the License.
     <serviceTask id="checkToken4ConfirmPasswordReset" name="Check token, remove and update
password" activiti:expression="#{passwordReset.execute(execution.processInstanceId)}"/>
     <sequenceFlow id="sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6" sourceRef="checkToken4ConfirmPasswordReset"
targetRef="notify4ConfirmPasswordReset"/>
     <serviceTask id="notify4ConfirmPasswordReset" name="Notification" activiti:expression="#{notify.execute(execution.processInstanceId)}"/>
-    <sequenceFlow id="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" sourceRef="notify4ConfirmPasswordReset"
targetRef="active"/>    
+    <sequenceFlow id="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" sourceRef="notify4ConfirmPasswordReset"
targetRef="active"/>
     
     <serviceTask id="delete" name="Delete" activiti:expression="#{delete.execute(execution.processInstanceId)}"/>
     <sequenceFlow id="flow99" sourceRef="delete" targetRef="theEnd"/>
-    <endEvent id="theEnd"/>    
+    <endEvent id="theEnd"/>
   </process>
   
   <bpmndi:BPMNDiagram id="BPMNDiagram_userWorkflow">
     <bpmndi:BPMNPlane bpmnElement="userWorkflow" id="BPMNPlane_userWorkflow">
       <bpmndi:BPMNShape bpmnElement="theStart" id="BPMNShape_theStart">
-        <omgdc:Bounds height="30.0" width="30.0" x="740.0" y="525.0"/>
+        <omgdc:Bounds height="30.0" width="30.0" x="540.0" y="525.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="create" id="BPMNShape_create">
-        <omgdc:Bounds height="60.00000000000006" width="100.0" x="820.0" y="509.99999999999994"/>
+        <omgdc:Bounds height="60.00000000000006" width="100.0" x="620.0" y="509.99999999999994"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="active" id="BPMNShape_active">
         <omgdc:Bounds height="60.0" width="100.0" x="1030.0" y="511.0"/>
@@ -110,12 +114,6 @@ under the License.
       <bpmndi:BPMNShape bpmnElement="reactivate" id="BPMNShape_reactivate">
         <omgdc:Bounds height="60.0" width="100.0" x="1940.0" y="290.0"/>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="delete" id="BPMNShape_delete">
-        <omgdc:Bounds height="60.0" width="100.0" x="1940.0" y="438.0"/>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="theEnd" id="BPMNShape_theEnd">
-        <omgdc:Bounds height="28.0" width="28.0" x="2080.0" y="451.0"/>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="generateToken4PasswordReset" id="BPMNShape_generateToken4PasswordReset">
         <omgdc:Bounds height="81.0" width="121.0" x="1515.0" y="604.5"/>
       </bpmndi:BPMNShape>
@@ -128,6 +126,15 @@ under the License.
       <bpmndi:BPMNShape bpmnElement="notify4ConfirmPasswordReset" id="BPMNShape_notify4ConfirmPasswordReset">
         <omgdc:Bounds height="81.0" width="121.0" x="1725.0" y="810.0"/>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="delete" id="BPMNShape_delete">
+        <omgdc:Bounds height="60.0" width="100.0" x="1940.0" y="438.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="theEnd" id="BPMNShape_theEnd">
+        <omgdc:Bounds height="28.0" width="28.0" x="2080.0" y="451.0"/>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="activate" id="BPMNShape_activate">
+        <omgdc:Bounds height="80.0" width="100.0" x="828.286878319943" y="500.0"/>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow12" id="BPMNEdge_flow12">
         <omgdi:waypoint x="1990.0" y="290.0"/>
         <omgdi:waypoint x="1990.0" y="261.0"/>
@@ -142,31 +149,35 @@ under the License.
         <omgdi:waypoint x="1590.0" y="400.0"/>
         <omgdi:waypoint x="1640.0" y="400.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="active2RequestPasswordReset" id="BPMNEdge_active2RequestPasswordReset">
-        <omgdi:waypoint x="1439.5" y="540.5"/>
-        <omgdi:waypoint x="1575.5" y="540.5"/>
-        <omgdi:waypoint x="1575.5" y="604.5"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="active2Suspend" id="BPMNEdge_active2Suspend">
         <omgdi:waypoint x="1440.0" y="540.0"/>
         <omgdi:waypoint x="1540.0" y="540.0"/>
         <omgdi:waypoint x="1540.0" y="430.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" id="BPMNEdge_sid-A37806A7-6B7B-48A2-BB37-DAE640231144">
+        <omgdi:waypoint x="1725.0" y="850.4571226080794"/>
+        <omgdi:waypoint x="1080.0" y="850.0"/>
+        <omgdi:waypoint x="1080.0" y="571.0"/>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="suspended2Delete" id="BPMNEdge_suspended2Delete">
         <omgdi:waypoint x="1860.0" y="400.0"/>
         <omgdi:waypoint x="1990.0" y="400.0"/>
         <omgdi:waypoint x="1990.0" y="438.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-A37806A7-6B7B-48A2-BB37-DAE640231144" id="BPMNEdge_sid-A37806A7-6B7B-48A2-BB37-DAE640231144">
-        <omgdi:waypoint x="1725.0" y="850.5"/>
-        <omgdi:waypoint x="1080.0" y="850.5"/>
-        <omgdi:waypoint x="1080.0" y="571.0"/>
+      <bpmndi:BPMNEdge bpmnElement="active2RequestPasswordReset" id="BPMNEdge_active2RequestPasswordReset">
+        <omgdi:waypoint x="1440.0" y="540.0"/>
+        <omgdi:waypoint x="1575.0" y="540.0"/>
+        <omgdi:waypoint x="1575.307142857143" y="604.5"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="active2Delete" id="BPMNEdge_active2Delete">
         <omgdi:waypoint x="1440.0" y="540.0"/>
         <omgdi:waypoint x="1990.0" y="540.0"/>
         <omgdi:waypoint x="1990.0" y="498.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2">
+        <omgdi:waypoint x="720.0" y="540.0"/>
+        <omgdi:waypoint x="828.286878319943" y="540.0"/>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6" id="BPMNEdge_sid-3E9FE01D-CC60-4A95-B356-CA0DC000FAD6">
         <omgdi:waypoint x="1785.5" y="745.5"/>
         <omgdi:waypoint x="1785.5" y="810.0"/>
@@ -175,22 +186,27 @@ under the License.
         <omgdi:waypoint x="1575.5" y="685.5"/>
         <omgdi:waypoint x="1575.5" y="750.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sid-EA94A12A-727F-414B-9D7E-AC576B0D6FA8" id="BPMNEdge_sid-EA94A12A-727F-414B-9D7E-AC576B0D6FA8">
-        <omgdi:waypoint x="920.0" y="540.2380952380952"/>
-        <omgdi:waypoint x="1030.0" y="540.7619047619048"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C" id="BPMNEdge_sid-EA22026A-25F0-4ED0-AB6E-9CE9CE74623C">
         <omgdi:waypoint x="1370.0" y="645.0"/>
         <omgdi:waypoint x="1080.0" y="645.0"/>
         <omgdi:waypoint x="1080.0" y="571.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="770.0" y="540.0"/>
-        <omgdi:waypoint x="820.0" y="540.0"/>
+        <omgdi:waypoint x="570.0" y="540.0"/>
+        <omgdi:waypoint x="620.0" y="540.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="active2ConfirmPasswordReset" id="BPMNEdge_active2ConfirmPasswordReset">
+        <omgdi:waypoint x="1440.0" y="540.0"/>
+        <omgdi:waypoint x="1785.0" y="540.0"/>
+        <omgdi:waypoint x="1785.3772727272726" y="664.5"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
+        <omgdi:waypoint x="928.286878319943" y="540.2478767845322"/>
+        <omgdi:waypoint x="1030.0" y="540.7521232154678"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sid-CF9ACA40-7750-47C3-A508-7250D24D4F1F" id="BPMNEdge_sid-CF9ACA40-7750-47C3-A508-7250D24D4F1F">
-        <omgdi:waypoint x="1515.0" y="790.5"/>
-        <omgdi:waypoint x="1080.0" y="790.5"/>
+        <omgdi:waypoint x="1515.0" y="790.4389505549949"/>
+        <omgdi:waypoint x="1080.0" y="790.0"/>
         <omgdi:waypoint x="1080.0" y="571.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="suspended2Reactivate" id="BPMNEdge_suspended2Reactivate">
@@ -199,10 +215,9 @@ under the License.
         <omgdi:waypoint x="1902.0" y="320.0"/>
         <omgdi:waypoint x="1940.0" y="320.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="active2ConfirmPasswordReset" id="BPMNEdge_active2ConfirmPasswordReset">
-        <omgdi:waypoint x="1439.5" y="540.5"/>
-        <omgdi:waypoint x="1785.5" y="540.5"/>
-        <omgdi:waypoint x="1785.5" y="664.5"/>
+      <bpmndi:BPMNEdge bpmnElement="flow99" id="BPMNEdge_flow99">
+        <omgdi:waypoint x="2040.0" y="466.5576923076923"/>
+        <omgdi:waypoint x="2080.005821071606" y="465.40367823831906"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8">
         <omgdi:waypoint x="1130.0" y="540.8529411764706"/>
@@ -212,10 +227,6 @@ under the License.
         <omgdi:waypoint x="1420.0" y="560.0"/>
         <omgdi:waypoint x="1420.0" y="615.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow99" id="BPMNEdge_flow99">
-        <omgdi:waypoint x="2040.0" y="466.5576923076923"/>
-        <omgdi:waypoint x="2080.005821071606" y="465.40367823831906"/>
-      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>
\ No newline at end of file


Mime
View raw message