syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1444867 - /syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
Date Mon, 11 Feb 2013 17:06:06 GMT
Author: ilgrosso
Date: Mon Feb 11 17:06:06 2013
New Revision: 1444867

URL: http://svn.apache.org/r1444867
Log:
[SYNCOPE-308] Re-merging user workflow definition from trunk

Modified:
    syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml

Modified: syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml?rev=1444867&r1=1444866&r2=1444867&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml (original)
+++ syncope/branches/1_0_X/core/src/main/resources/userWorkflow.bpmn20.xml Mon Feb 11 17:06:06
2013
@@ -23,12 +23,12 @@ under the License.
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:activiti="http://activiti.org/bpmn"
              xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" 
-             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
+             xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" 
              xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" 
              xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL 
                                  http://www.omg.org/spec/BPMN/2.0/20100501/BPMN20.xsd">
   
-  <process id="userWorkflow" name="User Workflow">
+  <process id="userWorkflow" name="User Workflow" isExecutable="true">
   
     <startEvent id="theStart"/>
     
@@ -165,11 +165,14 @@ under the License.
     <userTask id="rejected" name="Rejected"/>
         
     <sequenceFlow id="flow14" sourceRef="rejected" targetRef="rejectedGw"/>
-    
+
     <exclusiveGateway id="rejectedGw"/>
     <sequenceFlow id="rejected2Delete" sourceRef="rejectedGw" targetRef="delete">
       <conditionExpression xsi:type="tFormalExpression">${task == 'delete'}</conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="rejected2Rejected" sourceRef="rejectedGw" targetRef="rejected">
+      <conditionExpression xsi:type="tFormalExpression">${empty task}</conditionExpression>
+    </sequenceFlow>
     
     <!-- Delete an user (created, active or suspended) -->
     <serviceTask id="delete" name="Delete" activiti:class="org.apache.syncope.core.workflow.activiti.Delete"/>



Mime
View raw message