From 05d1778a5da301fed3d11c9d2ccc44c6313dec7b Mon Sep 17 00:00:00 2001
From: N Smith <left@alfresco.com>
Date: Mon, 23 May 2011 14:59:51 +0000
Subject: [PATCH] Fixed failing ActivitiWorkflowServiceIntegrationTest.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/activiti-context.xml          |  5 ++++
 .../activiti/ActivitiWorkflowManager.java     | 25 ++++++++++++-------
 .../ActivitiWorkflowManagerFactory.java       |  2 +-
 .../ActivitiPooledActorsPropertyHandler.java  |  9 ++++++-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/config/alfresco/activiti-context.xml b/config/alfresco/activiti-context.xml
index 337a606f4e..1b309ff155 100644
--- a/config/alfresco/activiti-context.xml
+++ b/config/alfresco/activiti-context.xml
@@ -99,6 +99,10 @@
     <bean id="activitiNodeConverter" factory-bean="activitiWorkflowManager"
         factory-method="getNodeConverter" />
 
+    <!-- Workflow Authority Manager -->
+    <bean id="workflowAuthorityManager" factory-bean="activitiWorkflowManager"
+        factory-method="getWorkflowAuthorityManager" />
+
     <!-- Activiti Property Handler Registry-->
     <bean id="activitiPropertyHandlerRegistry" factory-bean="activitiWorkflowManager"
         factory-method="getPropertyHandlerRegistry" />
@@ -137,6 +141,7 @@
         class="org.alfresco.repo.workflow.activiti.properties.ActivitiPooledActorsPropertyHandler"
         parent="activitiPropertyHandler" >
         <property name="taskService" ref="activitiTaskService" />
+        <property name="workflowAuthorityManager" ref="workflowAuthorityManager" />
     </bean>
 
     <!-- Activiti Priority Property Handler -->
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
index 51a17500ef..c0cfda0a2d 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
@@ -19,6 +19,7 @@
 
 package org.alfresco.repo.workflow.activiti;
 
+import org.alfresco.repo.workflow.WorkflowAuthorityManager;
 import org.alfresco.repo.workflow.WorkflowNodeConverter;
 import org.alfresco.repo.workflow.WorkflowPropertyHandlerRegistry;
 import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter;
@@ -33,19 +34,19 @@ public class ActivitiWorkflowManager
     private final WorkflowNodeConverter nodeConverter;
     private final WorkflowPropertyHandlerRegistry handlerRegistry;
     private final ActivitiWorkflowEngine workflowEngine;
-    /**
-     * @param workflowEngine
-     * @param propertyConverter
-     * @param handlerRegistry
-     * @param nodeConverter
-     */
-    public ActivitiWorkflowManager(ActivitiWorkflowEngine workflowEngine, ActivitiPropertyConverter propertyConverter,
-            WorkflowPropertyHandlerRegistry handlerRegistry, WorkflowNodeConverter nodeConverter)
+    private final WorkflowAuthorityManager workflowAuthorityManager;
+    
+    public ActivitiWorkflowManager(ActivitiWorkflowEngine workflowEngine,
+            ActivitiPropertyConverter propertyConverter,
+            WorkflowPropertyHandlerRegistry handlerRegistry, 
+            WorkflowNodeConverter nodeConverter,
+            WorkflowAuthorityManager workflowAuthorityManager)
     {
         this.workflowEngine = workflowEngine;
         this.propertyConverter = propertyConverter;
         this.handlerRegistry = handlerRegistry;
         this.nodeConverter = nodeConverter;
+        this.workflowAuthorityManager = workflowAuthorityManager;
     }
 
     /**
@@ -80,5 +81,11 @@ public class ActivitiWorkflowManager
         return workflowEngine;
     }
 
-    
+    /**
+     * @return the workflowAuthorityManager
+     */
+    public WorkflowAuthorityManager getWorkflowAuthorityManager()
+    {
+        return workflowAuthorityManager;
+    }
 }
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
index 39eb3554bd..96ebbcd5bf 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
@@ -112,7 +112,7 @@ public class ActivitiWorkflowManagerFactory implements FactoryBean<ActivitiWorkf
         workflowEngine.setTenantService(tenantService);
         workflowEngine.setTypeConverter(typeConverter);
         workflowEngine.setUnprotectedSearchService(unprotectedSearchService);
-        return new ActivitiWorkflowManager(workflowEngine, propertyConverter, handlerRegistry, nodeConverter);
+        return new ActivitiWorkflowManager(workflowEngine, propertyConverter, handlerRegistry, nodeConverter, authorityManager);
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
index 7f9a51c17c..5037ac8bc9 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
@@ -208,6 +208,14 @@ public class ActivitiPooledActorsPropertyHandler extends ActivitiTaskPropertyHan
         this.taskService = taskService;
     }
     
+    /**
+     * @param authorityManager the authorityManager to set
+     */
+    public void setWorkflowAuthorityManager(WorkflowAuthorityManager authorityManager)
+    {
+        this.authorityManager = authorityManager;
+    }
+    
     private static class UserAndGroupUpdates
     {
         private final List<String> users;
@@ -245,7 +253,6 @@ public class ActivitiPooledActorsPropertyHandler extends ActivitiTaskPropertyHan
         {
             return linksToRemove;
         }
-
     }
 
 }