Merged HEAD to BRANCHES/V2.1.0.x:

75186: RM Performance Improvements





git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1.0.x@76601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/rm-treenode.get.js

@@ -20,7 +20,7 @@ function getTreenode()
             "{http://www.alfresco.org/model/recordsmanagement/1.0}unfiledRecordContainer":true
          },
          skipPermissionCheck = args["perms"] == "false",
-         evalChildFolders = args["children"] !== "false",
+         evalChildFolders = false,
          item, rmNode, capabilities, cap;
    
       // Use helper function to get the arguments

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/AbstractCapabilityCondition.java

@@ -18,11 +18,16 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
 
+import java.util.Map;
+
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
+import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.springframework.beans.factory.BeanNameAware;
@@ -36,6 +41,9 @@ public abstract class AbstractCapabilityCondition implements CapabilityCondition
                                                              BeanNameAware,
                                                              RecordsManagementModel
 {
+    /** transaction cache key */
+    private static final String KEY_EVALUATE = "rm.transaction.evaluate";
+    
     /** Capability condition name */
     protected String name;
     
@@ -104,6 +112,35 @@ public abstract class AbstractCapabilityCondition implements CapabilityCondition
         return name;
     }
     
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
+     */
+    @Override
+    public boolean evaluate(NodeRef nodeRef)
+    {
+        boolean result = false;
+        
+        // check transaction cache
+        Map<String, Boolean> map = TransactionalResourceHelper.getMap(KEY_EVALUATE);
+        String key = getName() + "|" + nodeRef.toString() + "|" + AuthenticationUtil.getRunAsUser();
+        if (map.containsKey(key))
+        {
+            result = map.get(key);
+        }
+        else
+        {
+            result = evaluateImpl(nodeRef);
+            map.put(key, result);
+        }
+        
+        return result;
+    }
+    
+    /**
+     * Condition evaluate implementation
+     */
+    public abstract boolean evaluateImpl(NodeRef nodeRef);
+
     /**
      * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String)
      */

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/CapabilityCondition.java

@@ -20,9 +20,26 @@ package org.alfresco.module.org_alfresco_module_rm.capability.declarative;
 
 import org.alfresco.service.cmr.repository.NodeRef;
 
+/**
+ * Capability condition.
+ * 
+ * @author Roy Wetherall
+ * @since 2.0
+ */
 public interface CapabilityCondition
 {
+    /**
+     * Get capability condition name
+     * 
+     * @return {@link String}   capability condition name
+     */
     String getName();
     
+    /**
+     * Evaluates capability condition.
+     * 
+     * @param nodeRef   node reference
+     * @return boolean  true if evaluate success, false otherwise
+     */
     boolean evaluate(NodeRef nodeRef);
 }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/AtLeastOneCondition.java

@@ -44,10 +44,21 @@ public class AtLeastOneCondition extends AbstractCapabilityCondition
     }
     
     /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
+     * Don't use the transaction cache for the composite condition
+     * 
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
     public boolean evaluate(NodeRef nodeRef)
+    {
+        return evaluateImpl(nodeRef);
+    }
+
+    /**
+     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
+     */
+    @Override
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ClosedCapabilityCondition.java

@@ -35,7 +35,7 @@ public class ClosedCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         if (rmService.isRecordFolder(nodeRef) == true)

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CutoffCapabilityCondition.java

@@ -30,7 +30,7 @@ public class CutoffCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         return rmService.isCutoff(nodeRef);
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DeclaredCapabilityCondition.java

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public class DeclaredCapabilityCondition extends AbstractCapabilityCondition
 {
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         if (FilePlanComponentKind.RECORD.equals(filePlanService.getFilePlanComponentKind(nodeRef)) == true)

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/DestroyedCapabilityCondition.java

@@ -29,7 +29,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public class DestroyedCapabilityCondition extends AbstractCapabilityCondition
 {
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         return nodeService.hasAspect(nodeRef, ASPECT_GHOSTED);
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FailCapabilityCondition.java

@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public class FailCapabilityCondition extends AbstractCapabilityCondition
 {
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         return false;
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FileableCapabilityCondition.java

@@ -47,7 +47,7 @@ public class FileableCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         QName type = nodeService.getType(nodeRef);        
         // TODO and not already a record?

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingCapabilityCondition.java

@@ -34,7 +34,7 @@ public class FillingCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenCapabilityCondition.java

@@ -34,7 +34,7 @@ private boolean checkChildren = false;
     }
     
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = freezeService.isFrozen(nodeRef);
         if (result == false && checkChildren == true)

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FrozenOrHoldCondition.java

@@ -33,7 +33,7 @@ public class FrozenOrHoldCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
         return (freezeService.isFrozen(nodeRef) || 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasAspectCapabilityCondition.java

@@ -46,7 +46,7 @@ public class HasAspectCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         if (aspectName != null)

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasDispositionDateCapabilityCondition.java

@@ -45,7 +45,7 @@ public class HasDispositionDateCapabilityCondition extends AbstractCapabilityCon
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/HasEventsCapabilityCondition.java

@@ -45,7 +45,7 @@ public class HasEventsCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;        
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsClassifiedCapabilityCondition.java

@@ -46,7 +46,7 @@ public class IsClassifiedCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;        
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsPropertySetCondition.java

@@ -66,7 +66,7 @@ public class IsPropertySetCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         ParameterCheck.mandatory("nodeRef", nodeRef);
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCategoryCondition.java

@@ -34,7 +34,7 @@ public class IsRecordCategoryCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         ParameterCheck.mandatory("nodeRef", nodeRef);
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordCondition.java

@@ -34,7 +34,7 @@ public class IsRecordCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         ParameterCheck.mandatory("nodeRef", nodeRef);
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsRecordFolderCondition.java

@@ -34,7 +34,7 @@ public class IsRecordFolderCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         ParameterCheck.mandatory("nodeRef", nodeRef);
 

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsScheduledCapabilityCondition.java

@@ -56,7 +56,7 @@ public class IsScheduledCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;        
     

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/IsTransferAccessionCapabilityCondition.java

@@ -31,7 +31,7 @@ public class IsTransferAccessionCapabilityCondition extends AbstractCapabilityCo
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java

@@ -48,7 +48,7 @@ public class LastDispositionActionCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         DispositionAction dispositionAction = dispositionService.getLastCompletedDispostionAction(nodeRef);

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MayBeScheduledCapabilityCondition.java

@@ -57,7 +57,7 @@ public class MayBeScheduledCapabilityCondition extends AbstractCapabilityConditi
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;        
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/RecordFiledCapabilityCondition.java

@@ -33,7 +33,7 @@ public class RecordFiledCapabilityCondition extends AbstractCapabilityCondition
      * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
      */
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         return recordService.isFiled(nodeRef);
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/TransferredCapabilityCondition.java

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public class TransferredCapabilityCondition extends AbstractCapabilityCondition
 {
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         return nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_TRANSFERRED);
     }

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/VitalRecordOrFolderCapabilityCondition.java

@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 public class VitalRecordOrFolderCapabilityCondition extends AbstractCapabilityCondition
 {
     @Override
-    public boolean evaluate(NodeRef nodeRef)
+    public boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;        
         

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/ExtendedSecurityBaseDynamicAuthority.java

@@ -18,15 +18,16 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.security;
 
+import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.security.permissions.DynamicAuthority;
 import org.alfresco.repo.security.permissions.PermissionReference;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.cmr.security.AuthorityType;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -41,6 +42,9 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
                                                                       RecordsManagementModel, 
                                                                       ApplicationContextAware
 {
+    /** transaction cache key */
+    private static final String KEY_HAS_AUTHORITY_CACHE = "rm.transaction.hasAuthority";
+    
     /** Authority service */
     private AuthorityService authorityService;
     
@@ -133,14 +137,24 @@ public abstract class ExtendedSecurityBaseDynamicAuthority implements DynamicAut
                     }
                     else if (authority.startsWith("GROUP_") == true)
                     {
-                        // check group to see if the user is contained
+                        Map<String, Boolean> transactionCache = TransactionalResourceHelper.getMap(KEY_HAS_AUTHORITY_CACHE);
-                        Set<String> contained = getAuthorityService().getContainedAuthorities(AuthorityType.USER, authority, false);
+                        String key = authority + "|" + userName;
-                        if (contained.isEmpty() == false && 
+                        if (transactionCache.containsKey(key))
-                            contained.contains(userName) == true)
+
                         {
-                            result = true;
+                            result = transactionCache.get(key);
                             break;
                         }
+                        else
+                        {
+                            Set<String> contained = getAuthorityService().getAuthoritiesForUser(userName);
+                            if (contained.contains(authority))
+                            {
+                                result = true;
+                                transactionCache.put(key, result);
+                                break;
+                            }
+                        }
                     }
                     else
                     {

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java

@@ -27,6 +27,7 @@ import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.transaction.TransactionalResourceHelper;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -106,41 +107,54 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
     {
         FilePlanComponentKind result = null;
 
-        if (isFilePlanComponent(nodeRef))
+        Map<NodeRef, FilePlanComponentKind> map = TransactionalResourceHelper.getMap("rm.transaction.filePlanComponentByNodeRef");
+        if (map.containsKey(nodeRef))
         {
-            result = FilePlanComponentKind.FILE_PLAN_COMPONENT;
+            result = map.get(nodeRef);
+        }
+        else
+        {
+            if (isFilePlanComponent(nodeRef))
+            {
+                result = FilePlanComponentKind.FILE_PLAN_COMPONENT;
     
-            if (isFilePlan(nodeRef))
+                if (isFilePlan(nodeRef))
-            {
+                {
-                result = FilePlanComponentKind.FILE_PLAN;
+                    result = FilePlanComponentKind.FILE_PLAN;
+                }
+                else if (isRecordCategory(nodeRef))
+                {
+                    result = FilePlanComponentKind.RECORD_CATEGORY;
+                }
+                else if (isRecordFolder(nodeRef))
+                {
+                    result = FilePlanComponentKind.RECORD_FOLDER;
+                }
+                else if (isRecord(nodeRef))
+                {
+                    result = FilePlanComponentKind.RECORD;
+                }
+                else if (isHold(nodeRef))
+                {
+                    result = FilePlanComponentKind.HOLD;
+                }
+                else if (isTransfer(nodeRef))
+                {
+                    result = FilePlanComponentKind.TRANSFER;
+                }
+                else if (instanceOf(nodeRef, TYPE_DISPOSITION_SCHEDULE) || instanceOf(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION))
+                {
+                    result = FilePlanComponentKind.DISPOSITION_SCHEDULE;
+                }
+                else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_CONTAINER))
+                {
+                    result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER;
+                }
             }
-            else if (isRecordCategory(nodeRef))
+            
+            if (result != null)
             {
-                result = FilePlanComponentKind.RECORD_CATEGORY;
+                map.put(nodeRef, result);
-            }
-            else if (isRecordFolder(nodeRef))
-            {
-                result = FilePlanComponentKind.RECORD_FOLDER;
-            }
-            else if (isRecord(nodeRef))
-            {
-                result = FilePlanComponentKind.RECORD;
-            }
-            else if (isHold(nodeRef))
-            {
-                result = FilePlanComponentKind.HOLD;
-            }
-            else if (isTransfer(nodeRef))
-            {
-                result = FilePlanComponentKind.TRANSFER;
-            }
-            else if (instanceOf(nodeRef, TYPE_DISPOSITION_SCHEDULE) || instanceOf(nodeRef, TYPE_DISPOSITION_ACTION_DEFINITION))
-            {
-                result = FilePlanComponentKind.DISPOSITION_SCHEDULE;
-            }
-            else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_CONTAINER))
-            {
-                result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER;
             }
         }
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/issue/RM1039Test.java

@@ -161,11 +161,16 @@ public class RM1039Test extends BaseRMTestCase
                 // cutoff folder
                 actionService.executeRecordsManagementAction(testFolder, CutOffAction.NAME);
                                
+                return testFolder;                
+            }
+            
+            @Override
+            public void test(NodeRef result) throws Exception 
+            {	
                 // take a look at the move capability
                 Capability moveCapability = capabilityService.getCapability("Move");
-                assertEquals(AccessDecisionVoter.ACCESS_DENIED, moveCapability.evaluate(testFolder, destination));
+                assertEquals(AccessDecisionVoter.ACCESS_DENIED, moveCapability.evaluate(result, destination));
             	
-                return testFolder;                
             }
         });