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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
83759: Merge WAT2 to HEADBUGFIX: r83494  When package items are added/removed it dispatches an Activiti VARIABLE_UPDATED event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:13:54 +00:00
parent 01aba183d1
commit 1565069584
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/public-rest-context.xml
View File

@@ -822,6 +822,7 @@
<property name="namespaceService" ref="NamespaceService" /> <property name="namespaceService" ref="NamespaceService" />
<property name="tenantService" ref="tenantService" /> <property name="tenantService" ref="tenantService" />
<property name="nodeService" ref="nodeService"/> <property name="nodeService" ref="nodeService"/>
<property name="activitiWorkflowEngine" ref="activitiWorkflowEngine" />
</bean> </bean>
<bean id="deployments" class="org.alfresco.rest.workflow.api.impl.DeploymentsImpl" parent="baseWorkflowRest"> <bean id="deployments" class="org.alfresco.rest.workflow.api.impl.DeploymentsImpl" parent="baseWorkflowRest">

9
source/java/org/alfresco/rest/workflow/api/impl/WorkflowRestImpl.java
View File

@@ -26,6 +26,7 @@ import org.alfresco.repo.workflow.WorkflowConstants;
import org.alfresco.repo.workflow.WorkflowModel; import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.repo.workflow.activiti.ActivitiConstants; import org.alfresco.repo.workflow.activiti.ActivitiConstants;
import org.alfresco.repo.workflow.activiti.ActivitiScriptNode; import org.alfresco.repo.workflow.activiti.ActivitiScriptNode;
import org.alfresco.repo.workflow.activiti.ActivitiWorkflowEngine;
import org.alfresco.rest.framework.core.exceptions.ApiException; import org.alfresco.rest.framework.core.exceptions.ApiException;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
@@ -72,6 +73,7 @@ public class WorkflowRestImpl
protected ProcessEngine activitiProcessEngine; protected ProcessEngine activitiProcessEngine;
protected boolean deployWorkflowsInTenant; protected boolean deployWorkflowsInTenant;
protected List<String> excludeModelTypes = new ArrayList<String>(Arrays.asList("bpm_priority", "bpm_description", "bpm_dueDate")); protected List<String> excludeModelTypes = new ArrayList<String>(Arrays.asList("bpm_priority", "bpm_description", "bpm_dueDate"));
private ActivitiWorkflowEngine activitiWorkflowEngine;
static static
{ {
@@ -269,6 +271,7 @@ public class WorkflowRestImpl
} }
Item responseItem = createItemForNodeRef(nodeRef); Item responseItem = createItemForNodeRef(nodeRef);
activitiWorkflowEngine.dispatchPackageUpdatedEvent(packageScriptNode, null, null, processId, null);
return responseItem; return responseItem;
} }
@@ -312,6 +315,7 @@ public class WorkflowRestImpl
try try
{ {
nodeService.removeChild(packageScriptNode.getNodeRef(), nodeRef); nodeService.removeChild(packageScriptNode.getNodeRef(), nodeRef);
activitiWorkflowEngine.dispatchPackageUpdatedEvent(packageScriptNode, null, null, processId, null);
} }
catch (InvalidNodeRefException e) catch (InvalidNodeRefException e)
{ {
@@ -541,4 +545,9 @@ public class WorkflowRestImpl
} }
return item; return item;
} }
public void setActivitiWorkflowEngine(ActivitiWorkflowEngine activitiWorkflowEngine)
{
this.activitiWorkflowEngine = activitiWorkflowEngine;
}
} }