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

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

Browse Source 
42843: ALF-16346: Preventing contention on packages system folder when creating workflow

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2012-10-19 10:16:18 +00:00
parent 205d94c7fc
commit 7bb82f5143
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/workflow-context.xml
View File

@@ -41,6 +41,7 @@
<property name="namespaceService" ref="namespaceService"/> <property name="namespaceService" ref="namespaceService"/>
<property name="tenantService" ref="tenantService"/> <property name="tenantService" ref="tenantService"/>
<property name="messageService" ref="messageService"/> <property name="messageService" ref="messageService"/>
<property name="policyBehaviourFilter" ref="policyBehaviourFilter"/>
</bean> </bean>
<bean id="workflowInterpreter" class="org.alfresco.repo.workflow.WorkflowInterpreter" parent="interpreterBase"> <bean id="workflowInterpreter" class="org.alfresco.repo.workflow.WorkflowInterpreter" parent="interpreterBase">

31
source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
View File

@@ -27,6 +27,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.i18n.MessageService; import org.alfresco.repo.i18n.MessageService;
import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.node.SystemNodeUtils; import org.alfresco.repo.node.SystemNodeUtils;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -60,6 +61,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
private NodeRef systemWorkflowContainer = null; private NodeRef systemWorkflowContainer = null;
private TenantService tenantService; private TenantService tenantService;
private MessageService messageService; private MessageService messageService;
private BehaviourFilter policyBehaviourFilter;
/** /**
* @param bootstrap the importer bootstrap for the store to place workflow * @param bootstrap the importer bootstrap for the store to place workflow
@@ -114,6 +116,13 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
{ {
this.messageService = messageService; this.messageService = messageService;
} }
/**
* @param policyBehaviourFilter the behaviourFilter to set
*/
public void setPolicyBehaviourFilter(BehaviourFilter policyBehaviourFilter) {
this.policyBehaviourFilter = policyBehaviourFilter;
}
/** /**
* {@inheritDoc} * {@inheritDoc}
@@ -146,13 +155,21 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
NodeRef packages = findOrCreatePackagesFolder(); NodeRef packages = findOrCreatePackagesFolder();
String packageId = "pkg_" + GUID.generate(); String packageId = "pkg_" + GUID.generate();
QName packageName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, packageId); QName packageName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, packageId);
ChildAssociationRef packageAssoc = nodeService.createNode(packages, ContentModel.ASSOC_CONTAINS, packageName,
WorkflowModel.TYPE_PACKAGE); try {
NodeRef packageContainer = packageAssoc.getChildRef(); policyBehaviourFilter.disableBehaviour(packages, ContentModel.ASPECT_AUDITABLE);
// TODO: For now, grant full access to everyone ChildAssociationRef packageAssoc = nodeService.createNode(packages, ContentModel.ASSOC_CONTAINS, packageName,
permissionService.setPermission(packageContainer, PermissionService.ALL_AUTHORITIES, WorkflowModel.TYPE_PACKAGE);
PermissionService.ALL_PERMISSIONS, true); NodeRef packageContainer = packageAssoc.getChildRef();
return packageContainer; // TODO: For now, grant full access to everyone
permissionService.setPermission(packageContainer, PermissionService.ALL_AUTHORITIES,
PermissionService.ALL_PERMISSIONS, true);
return packageContainer;
}
finally
{
policyBehaviourFilter.enableBehaviour(packages, ContentModel.ASPECT_AUDITABLE);
}
} }
/** /**