Continuing refactor of InvitationServiceImpl to use Activiti workflows.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-08-24 10:04:18 +00:00
parent c9eda64276
commit 4c867eb9dc
5 changed files with 16 additions and 13 deletions

View File

@@ -11,7 +11,7 @@
<sequenceFlow id="flow1" sourceRef="start" targetRef="reviewTask" />
<userTask id="reviewTask" name="Review Task"
activiti:formKey="imwf:moderatedInvitationReviewTask">
activiti:formKey="imwf:activitiModeratedInvitationReviewTask">
<extensionElements>
<activiti:taskListener event="create"
class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
@@ -34,8 +34,7 @@
</extensionElements>
<potentialOwner>
<resourceAssignmentExpression>
<formalExpression>${bpm_groupAssignee.properties.authorityName}
</formalExpression>
<formalExpression>${bpm_groupAssignee}</formalExpression>
</resourceAssignmentExpression>
</potentialOwner>
</userTask>
@@ -48,12 +47,12 @@
<conditionExpression xsi:type="tFormalExpression">${imwf_reviewOutcome == 'Approve'}</conditionExpression>
</sequenceFlow>
<serviceTask id="approved" name="Approved" activiti:class="ApproveModeratedInviteDelegate" />
<serviceTask id="approved" name="Approved" activiti:delegateExpression="${ApproveModeratedInviteDelegate}" />
<sequenceFlow id="flow5" sourceRef="approved" targetRef="end" />
<sequenceFlow id="flow4" sourceRef="reviewDecision" targetRef="rejected" />
<serviceTask id="rejected" name="Rejected" activiti:class="RejectModeratedInviteDelegate" />
<serviceTask id="rejected" name="Rejected" activiti:delegateExpression="${RejectModeratedInviteDelegate}" />
<sequenceFlow id='flow6' sourceRef='rejected' targetRef='end' />
<endEvent id="end" />

View File

@@ -70,7 +70,6 @@
<list>
<value>accept</value>
<value>reject</value>
<value>reject</value>
</list>
</parameter>
</constraint>
@@ -79,8 +78,7 @@
</properties>
<overrides>
<property name="bpm:outcomePropertyName">
<default>{http://www.alfresco.org/model/workflow/invite/moderated/1.0}reviewOutcome
</default>
<default>{http://www.alfresco.org/model/workflow/invite/nominated/1.0}inviteOutcome</default>
</property>
<property name="bpm:reassignable">
<default>false</default>

View File

@@ -15,7 +15,7 @@
<sequenceFlow id="flow2" sourceRef="sendInvite" targetRef="invitePending" />
<userTask id="invitePending" name="Invite Pending"
activiti:formKey="inwf:invitePendingTask">
activiti:formKey="inwf:activitiInvitePendingTask">
<extensionElements>
<activiti:taskListener event="create"
class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
@@ -28,6 +28,13 @@
</activiti:string>
</activiti:field>
</activiti:taskListener>
<activiti:taskListener event="complete" class="org.alfresco.repo.workflow.activiti.tasklistener.ScriptTaskListener">
<activiti:field name="script">
<activiti:string>
execution.setVariable('inwf_inviteOutcome', task.getVariable('inwf_inviteOutcome'));
</activiti:string>
</activiti:field>
</activiti:taskListener>
</extensionElements>
<humanPerformer>
<resourceAssignmentExpression>