inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing ActivitiWorkflowServiceIntegrationTest.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/activiti-context.xml
View File

@@ -99,6 +99,10 @@
<bean id="activitiNodeConverter" factory-bean="activitiWorkflowManager" <bean id="activitiNodeConverter" factory-bean="activitiWorkflowManager"
factory-method="getNodeConverter" /> factory-method="getNodeConverter" />
<!-- Workflow Authority Manager -->
<bean id="workflowAuthorityManager" factory-bean="activitiWorkflowManager"
factory-method="getWorkflowAuthorityManager" />
<!-- Activiti Property Handler Registry--> <!-- Activiti Property Handler Registry-->
<bean id="activitiPropertyHandlerRegistry" factory-bean="activitiWorkflowManager" <bean id="activitiPropertyHandlerRegistry" factory-bean="activitiWorkflowManager"
factory-method="getPropertyHandlerRegistry" /> factory-method="getPropertyHandlerRegistry" />
@@ -137,6 +141,7 @@
class="org.alfresco.repo.workflow.activiti.properties.ActivitiPooledActorsPropertyHandler" class="org.alfresco.repo.workflow.activiti.properties.ActivitiPooledActorsPropertyHandler"
parent="activitiPropertyHandler" > parent="activitiPropertyHandler" >
<property name="taskService" ref="activitiTaskService" /> <property name="taskService" ref="activitiTaskService" />
<property name="workflowAuthorityManager" ref="workflowAuthorityManager" />
</bean> </bean>
<!-- Activiti Priority Property Handler --> <!-- Activiti Priority Property Handler -->

25
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManager.java
View File

@@ -19,6 +19,7 @@
package org.alfresco.repo.workflow.activiti; package org.alfresco.repo.workflow.activiti;
import org.alfresco.repo.workflow.WorkflowAuthorityManager;
import org.alfresco.repo.workflow.WorkflowNodeConverter; import org.alfresco.repo.workflow.WorkflowNodeConverter;
import org.alfresco.repo.workflow.WorkflowPropertyHandlerRegistry; import org.alfresco.repo.workflow.WorkflowPropertyHandlerRegistry;
import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter; import org.alfresco.repo.workflow.activiti.properties.ActivitiPropertyConverter;
@@ -33,19 +34,19 @@ public class ActivitiWorkflowManager
private final WorkflowNodeConverter nodeConverter; private final WorkflowNodeConverter nodeConverter;
private final WorkflowPropertyHandlerRegistry handlerRegistry; private final WorkflowPropertyHandlerRegistry handlerRegistry;
private final ActivitiWorkflowEngine workflowEngine; private final ActivitiWorkflowEngine workflowEngine;
/** private final WorkflowAuthorityManager workflowAuthorityManager;
* @param workflowEngine
* @param propertyConverter public ActivitiWorkflowManager(ActivitiWorkflowEngine workflowEngine,
* @param handlerRegistry ActivitiPropertyConverter propertyConverter,
* @param nodeConverter WorkflowPropertyHandlerRegistry handlerRegistry,
*/ WorkflowNodeConverter nodeConverter,
public ActivitiWorkflowManager(ActivitiWorkflowEngine workflowEngine, ActivitiPropertyConverter propertyConverter, WorkflowAuthorityManager workflowAuthorityManager)
WorkflowPropertyHandlerRegistry handlerRegistry, WorkflowNodeConverter nodeConverter)
{ {
this.workflowEngine = workflowEngine; this.workflowEngine = workflowEngine;
this.propertyConverter = propertyConverter; this.propertyConverter = propertyConverter;
this.handlerRegistry = handlerRegistry; this.handlerRegistry = handlerRegistry;
this.nodeConverter = nodeConverter; this.nodeConverter = nodeConverter;
this.workflowAuthorityManager = workflowAuthorityManager;
} }
/** /**
@@ -80,5 +81,11 @@ public class ActivitiWorkflowManager
return workflowEngine; return workflowEngine;
} }
/**
* @return the workflowAuthorityManager
*/
public WorkflowAuthorityManager getWorkflowAuthorityManager()
{
return workflowAuthorityManager;
}
} }

2
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowManagerFactory.java
View File

@@ -112,7 +112,7 @@ public class ActivitiWorkflowManagerFactory implements FactoryBean<ActivitiWorkf
workflowEngine.setTenantService(tenantService); workflowEngine.setTenantService(tenantService);
workflowEngine.setTypeConverter(typeConverter); workflowEngine.setTypeConverter(typeConverter);
workflowEngine.setUnprotectedSearchService(unprotectedSearchService); workflowEngine.setUnprotectedSearchService(unprotectedSearchService);
return new ActivitiWorkflowManager(workflowEngine, propertyConverter, handlerRegistry, nodeConverter); return new ActivitiWorkflowManager(workflowEngine, propertyConverter, handlerRegistry, nodeConverter, authorityManager);
} }
/** /**

9
source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPooledActorsPropertyHandler.java
View File

@@ -208,6 +208,14 @@ public class ActivitiPooledActorsPropertyHandler extends ActivitiTaskPropertyHan
this.taskService = taskService; this.taskService = taskService;
} }
/**
* @param authorityManager the authorityManager to set
*/
public void setWorkflowAuthorityManager(WorkflowAuthorityManager authorityManager)
{
this.authorityManager = authorityManager;
}
private static class UserAndGroupUpdates private static class UserAndGroupUpdates
{ {
private final List<String> users; private final List<String> users;
@@ -245,7 +253,6 @@ public class ActivitiPooledActorsPropertyHandler extends ActivitiTaskPropertyHan
{ {
return linksToRemove; return linksToRemove;
} }
} }
} }