Merge branch 'release/V2.5' into merge/Merge_2332_2396

Conflicts:
	rm-automation/src/test/resources/module.properties
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java

@@ -27,6 +27,12 @@
 
 package org.alfresco.module.org_alfresco_module_rm.record;
 
+
+import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.FIRST_EVENT;
+import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT;
+import static org.alfresco.repo.policy.annotation.BehaviourKind.ASSOCIATION;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,10 +73,9 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role;
 import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
 import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionModel;
 import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
+import org.alfresco.repo.content.ContentServicePolicies;
 import org.alfresco.repo.node.NodeServicePolicies;
-import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
 import org.alfresco.repo.policy.ClassPolicyDelegate;
-import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.policy.annotation.Behaviour;
 import org.alfresco.repo.policy.annotation.BehaviourBean;
@@ -82,16 +87,13 @@ import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
-import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.model.FileNotFoundException;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
-import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.security.AccessPermission;
@@ -126,9 +128,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
                                           RecordsManagementModel,
                                           RecordsManagementCustomModel,
                                           NodeServicePolicies.OnCreateChildAssociationPolicy,
-                                          NodeServicePolicies.OnAddAspectPolicy,
+                                          NodeServicePolicies.OnUpdatePropertiesPolicy,
-                                          NodeServicePolicies.OnRemoveAspectPolicy,
+                                          ContentServicePolicies.OnContentUpdatePolicy
-                                          NodeServicePolicies.OnUpdatePropertiesPolicy
 {
     /** Logger */
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class);
@@ -141,7 +142,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
     /** transation data key */
     private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate";
-    private static final String KEY_PENDING_FILLING = "pendingFilling";
     public static final String KEY_NEW_RECORDS = "newRecords";
 
     /** I18N */
@@ -257,12 +257,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
     private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord;
     private ClassPolicyDelegate<OnFileRecord> onFileRecord;
 
-    /** Behaviours */
-    private JavaBehaviour onCreateChildAssociation = new JavaBehaviour(
-                                                            this,
-                                                            "onCreateChildAssociation",
-                                                            NotificationFrequency.FIRST_EVENT);
-
     /**
      * @param identifierService identifier service
      */
@@ -415,13 +409,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
         // bind policies
         beforeFileRecord = policyComponent.registerClassPolicy(BeforeFileRecord.class);
         onFileRecord = policyComponent.registerClassPolicy(OnFileRecord.class);
-
-        // bind behaviours
-        policyComponent.bindAssociationBehaviour(
-                NodeServicePolicies.OnCreateChildAssociationPolicy.QNAME,
-                TYPE_RECORD_FOLDER,
-                ContentModel.ASSOC_CONTAINS,
-                onCreateChildAssociation);
     }
 
     /**
@@ -430,88 +417,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
     @Override
     @Behaviour
     (
-            kind = BehaviourKind.CLASS,
+       kind = ASSOCIATION,
-            type = "sys:noContent"
+       type = "rma:recordFolder",
+       notificationFrequency = FIRST_EVENT
     )
-    public void onRemoveAspect(NodeRef nodeRef, QName aspect)
-    {
-
-        if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
-        {
-            ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
-
-            // Only switch name back to the format of "name (identifierId)" if content size is non-zero, else leave it as the original name to avoid CIFS shuffling issues.
-            if (contentData != null && contentData.getSize() > 0)
-            {
-                switchNames(nodeRef);
-            }
-        }
-        else
-        {
-            // check whether filling is pending aspect removal
-            Set<NodeRef> pendingFilling = transactionalResourceHelper.getSet(KEY_PENDING_FILLING);
-            if (pendingFilling.contains(nodeRef))
-            {
-                file(nodeRef);
-            }
-        }
-    }
-
-    /**
-     * @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
-     */
-    @Override
-    @Behaviour
-    (
-            kind = BehaviourKind.CLASS,
-            type = "sys:noContent"
-    )
-    public void onAddAspect(NodeRef nodeRef, QName aspect)
-    {
-        switchNames(nodeRef);
-    }
-
-    /**
-     * Helper method to switch the name of the record around.  Used to support record creation via
-     * file protocols.
-     *
-     * @param nodeRef   node reference (record)
-     */
-    private void switchNames(NodeRef nodeRef)
-    {
-        try
-        {
-            if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
-            {
-                String origionalName =  (String)nodeService.getProperty(nodeRef, PROP_ORIGIONAL_NAME);
-                if (origionalName != null)
-                {
-                    String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
-                    fileFolderService.rename(nodeRef, origionalName);
-                    nodeService.setProperty(nodeRef, PROP_ORIGIONAL_NAME, name);
-                }
-            }
-        }
-        catch (FileExistsException e)
-        {
-            LOGGER.debug(e.getMessage());
-        }
-        catch (InvalidNodeRefException e)
-        {
-            LOGGER.debug(e.getMessage());
-        }
-        catch (FileNotFoundException e)
-        {
-            LOGGER.debug(e.getMessage());
-        }
-    }
-
-    /**
-     * Behaviour executed when a new item is added to a record folder.
-     *
-     * @see org.alfresco.repo.node.NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(org.alfresco.service.cmr.repository.ChildAssociationRef, boolean)
-     */
-    @Override
     public void onCreateChildAssociation(final ChildAssociationRef childAssocRef, final boolean bNew)
     {
         AuthenticationUtil.runAs(new RunAsWork<Void>()
@@ -519,7 +428,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
             @Override
             public Void doWork()
             {
-                onCreateChildAssociation.disable();
                 try
                 {
                     NodeRef nodeRef = childAssocRef.getChildRef();
@@ -527,14 +435,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) &&
                         !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) &&
                         !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY))
-                    {
-                        if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT))
-                        {
-                            // we need to postpone filling until the NO_CONTENT aspect is removed
-                            Set<NodeRef> pendingFilling = transactionalResourceHelper.getSet(KEY_PENDING_FILLING);
-                            pendingFilling.add(nodeRef);
-                        }
-                        else
                     {
                         // store information about the 'new' record in the transaction
                         // @since 2.3
@@ -561,7 +461,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
                         dispositionService.recalculateNextDispositionStep(nodeRef);
                     }
                 }
-                }
                 catch (RecordLinkRuntimeException e)
                 {
                     // rethrow exception
@@ -572,10 +471,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     // do nothing but log error
                     LOGGER.warn("Unable to file pending record.", e);
                 }
-                finally
-                {
-                    onCreateChildAssociation.enable();
-                }
 
                 return null;
             }
@@ -908,6 +803,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                         // make the document a record
                         makeRecord(nodeRef);
+                        renameRecord(nodeRef);
 
                         if (latestVersionRecord != null)
                         {
@@ -1116,6 +1012,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
                     // make record
                     makeRecord(record);
+                    renameRecord(record);
 
                     // remove added copy assocs
                     List<AssociationRef> recordAssocs = nodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL);
@@ -1250,6 +1147,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
                     {
                         // make record
                         makeRecord(record);
+                        renameRecord(record);
                     }
 
                     return record;
@@ -1286,28 +1184,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
             // get the record name
             String name = (String)nodeService.getProperty(document, ContentModel.PROP_NAME);
 
-            // rename the record
-            int dotIndex = name.lastIndexOf('.');
-            String prefix = name;
-            String postfix = "";
-            if (dotIndex != -1)
-            {
-                prefix = name.substring(0, dotIndex);
-                postfix = name.substring(dotIndex);
-            }
-            String recordName = prefix + " (" + recordId + ")" + postfix;
-            behaviourFilter.disableBehaviour();
-            try
-            {
-            	fileFolderService.rename(document, recordName);
-            }
-            finally
-            {
-            	behaviourFilter.enableBehaviour();
-            }
-
-            LOGGER.debug("Rename {} to {}", name, recordName);
-
             // add the record aspect
             Map<QName, Serializable> props = new HashMap<QName, Serializable>(2);
             props.put(PROP_IDENTIFIER, recordId);
@@ -1319,10 +1195,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
 
             // remove the owner
             ownableService.setOwner(document, OwnableService.NO_OWNER);
-        }
+
-        catch (FileNotFoundException e)
+            if (TYPE_NON_ELECTRONIC_DOCUMENT.equals(nodeService.getType(document)))
             {
-            throw new AlfrescoRuntimeException("Unable to make record, because rename failed.", e);
+                renameRecord(document);
+            }
         }
         finally
         {
@@ -1875,4 +1752,49 @@ public class RecordServiceImpl extends BaseBehaviourBean
             throw new RecordLinkRuntimeException("Can only unlink a record from a record folder.");
         }
     }
+
+    /*
+     * @see org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy#onContentUpdate(org.alfresco.service.cmr.repository.NodeRef, boolean)
+     */
+    @Override
+    @Behaviour
+    (
+            kind = BehaviourKind.CLASS,
+            type = "rma:record",
+            notificationFrequency = TRANSACTION_COMMIT
+    )
+    public void onContentUpdate(NodeRef nodeRef, boolean newContent)
+    {
+        if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN))
+        {
+            renameRecord(nodeRef);
+        }
+    }
+
+    private void renameRecord(NodeRef nodeRef)
+    {
+        // get the record id
+        String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);
+
+        if (isNotBlank(recordId))
+        {
+            // get the record name
+            String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
+
+            // rename the record
+            int dotIndex = name.lastIndexOf('.');
+            String prefix = name;
+            String postfix = "";
+            if (dotIndex > 0)
+            {
+                prefix = name.substring(0, dotIndex);
+                postfix = name.substring(dotIndex);
+            }
+            String recordName = prefix + " (" + recordId + ")" + postfix;
+
+            nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, recordName);
+
+            LOGGER.debug("Rename " + name + " to " + recordName);
+        }
+    }
 }

rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java

@@ -52,6 +52,7 @@ import org.junit.runner.RunWith;
     "!.*RM2190Test",
     "!.*RM981SystemTest",
     "!.*RM3993Test",
+    "!.*RM4163Test",
     "!.*RecordsManagementEventServiceImplTest",
     "!.*RmRestApiTest",
     "!.*NotificationServiceHelperSystemTest",