Fixed failing ActivitiWorkflowServiceIntegrationTest.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-05-23 14:59:51 +00:00
parent 13a5830aae
commit 05d1778a5d
4 changed files with 30 additions and 11 deletions

View File

@@ -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;
}
}

View File

@@ -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);
}
/**

View File

@@ -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;
}
}
}