From 4c867eb9dc3bb97acf123422c5844599c46b396f Mon Sep 17 00:00:00 2001
From: N Smith <left@alfresco.com>
Date: Wed, 24 Aug 2011 10:04:18 +0000
Subject: [PATCH] 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
---
 config/alfresco/workflow/invitation-moderated.bpmn20.xml | 9 ++++-----
 .../workflow/invitation-nominated-workflow-model.xml     | 4 +---
 config/alfresco/workflow/invitation-nominated.bpmn20.xml | 9 ++++++++-
 .../alfresco/repo/invitation/InvitationServiceImpl.java  | 5 ++---
 .../repo/invitation/InvitationServiceImplTest.java       | 2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/config/alfresco/workflow/invitation-moderated.bpmn20.xml b/config/alfresco/workflow/invitation-moderated.bpmn20.xml
index c92e37ae2d..c1ee8264fd 100644
--- a/config/alfresco/workflow/invitation-moderated.bpmn20.xml
+++ b/config/alfresco/workflow/invitation-moderated.bpmn20.xml
@@ -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" />
diff --git a/config/alfresco/workflow/invitation-nominated-workflow-model.xml b/config/alfresco/workflow/invitation-nominated-workflow-model.xml
index 5e6d0734e3..3f0847b0dd 100644
--- a/config/alfresco/workflow/invitation-nominated-workflow-model.xml
+++ b/config/alfresco/workflow/invitation-nominated-workflow-model.xml
@@ -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>
diff --git a/config/alfresco/workflow/invitation-nominated.bpmn20.xml b/config/alfresco/workflow/invitation-nominated.bpmn20.xml
index f58176ad3b..32f43cfa10 100644
--- a/config/alfresco/workflow/invitation-nominated.bpmn20.xml
+++ b/config/alfresco/workflow/invitation-nominated.bpmn20.xml
@@ -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>
diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
index 2e32042dbb..b59c53d8d7 100644
--- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
+++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
@@ -584,7 +584,7 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
                 // get workflow instance (ID) that pendingInvite task (in query
                 // result set)
 
-                String workflowId = workflowTask.path.instance.id;
+                String workflowId = workflowTask.getPath().getInstance().getId();
                 // TODO ALFCOM-2597 workflowTask.properties does not contain
                 // custom process values
                 // NominatedInvitationImpl result = new
@@ -1007,8 +1007,7 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
 
             inviteeUserName = null;
 
-            Set<NodeRef> peopleWithInviteeEmail = this.personService.getPeopleFilteredByProperty(
-                        ContentModel.PROP_EMAIL, inviteeEmail);
+            Set<NodeRef> peopleWithInviteeEmail = personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, inviteeEmail);
 
             if (peopleWithInviteeEmail.size() > 0)
             {
diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
index aa5758969c..62ed25de82 100644
--- a/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
+++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImplTest.java
@@ -799,7 +799,7 @@ public class InvitationServiceImplTest extends BaseAlfrescoSpringTest
          * Now verify access control list contains user two
          */
         String roleName = siteService.getMembersRole(resourceName, inviteeUserName);
-        assertEquals("role name wrong", roleName, inviteeRole);
+        assertEquals("role name wrong", inviteeRole, roleName);
 
         /**
          * Negative test attempt to approve an invitation that has aready been