From 7bb82f514328498e710d2e4440e444420ade0955 Mon Sep 17 00:00:00 2001
From: Frederik Heremans <frederik.heremans@alfresco.com>
Date: Fri, 19 Oct 2012 10:16:18 +0000
Subject: [PATCH] Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:    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
---
 config/alfresco/workflow-context.xml          |  1 +
 .../repo/workflow/WorkflowPackageImpl.java    | 31 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml
index 1c9d1b51eb..836f078b32 100644
--- a/config/alfresco/workflow-context.xml
+++ b/config/alfresco/workflow-context.xml
@@ -41,6 +41,7 @@
       <property name="namespaceService" ref="namespaceService"/>
       <property name="tenantService" ref="tenantService"/>
       <property name="messageService" ref="messageService"/>
+      <property name="policyBehaviourFilter" ref="policyBehaviourFilter"/>
    </bean>
 
    <bean id="workflowInterpreter" class="org.alfresco.repo.workflow.WorkflowInterpreter" parent="interpreterBase">
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
index af5245ea9c..fc31328be0 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowPackageImpl.java
@@ -27,6 +27,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.importer.ImporterBootstrap;
 import org.alfresco.repo.node.SystemNodeUtils;
+import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.tenant.TenantService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -60,6 +61,7 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
     private NodeRef systemWorkflowContainer = null;
     private TenantService tenantService;
     private MessageService messageService;
+    private BehaviourFilter policyBehaviourFilter;
     
     /**
      * @param bootstrap the importer bootstrap for the store to place workflow
@@ -114,6 +116,13 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
     {
         this.messageService = messageService;
     }
+    
+    /**
+     * @param policyBehaviourFilter the behaviourFilter to set
+     */
+    public void setPolicyBehaviourFilter(BehaviourFilter policyBehaviourFilter) {
+		this.policyBehaviourFilter = policyBehaviourFilter;
+	}
 
     /**
     * {@inheritDoc}
@@ -146,13 +155,21 @@ public class WorkflowPackageImpl implements WorkflowPackageComponent
         NodeRef packages = findOrCreatePackagesFolder();
         String packageId = "pkg_" + GUID.generate();
         QName packageName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, packageId);
-        ChildAssociationRef packageAssoc = nodeService.createNode(packages, ContentModel.ASSOC_CONTAINS, packageName,
-                    WorkflowModel.TYPE_PACKAGE);
-        NodeRef packageContainer = packageAssoc.getChildRef();
-        // TODO: For now, grant full access to everyone
-        permissionService.setPermission(packageContainer, PermissionService.ALL_AUTHORITIES,
-                    PermissionService.ALL_PERMISSIONS, true);
-        return packageContainer;
+        
+        try {
+        	policyBehaviourFilter.disableBehaviour(packages, ContentModel.ASPECT_AUDITABLE); 
+        	ChildAssociationRef packageAssoc = nodeService.createNode(packages, ContentModel.ASSOC_CONTAINS, packageName,
+        			WorkflowModel.TYPE_PACKAGE);
+        	NodeRef packageContainer = packageAssoc.getChildRef();
+        	// 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); 
+        }
     }
 
     /**