Revert "Record only merge of version change."

This reverts commit 6e197f2a2d, reversing
changes made to 211244279a.

pom.xml

@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm</artifactId>
    <packaging>pom</packaging>
-   <version>2.5.5-SNAPSHOT</version>
+   <version>2.5.3.3-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <parent>
@@ -24,7 +24,7 @@
       <connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
       <developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
       <url>https://git.alfresco.com/records-management/records-management</url>
-     <tag>HEAD</tag>
+     <tag>V2.5.3</tag>
   </scm>
 
    <issueManagement>

rm-automation/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.5-SNAPSHOT</version>
+      <version>2.5.3.3-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.5-SNAPSHOT</version>
+      <version>2.5.3.3-SNAPSHOT</version>
    </parent>
 
    <licenses>

rm-community/rm-community-repo/pom.xml

@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>2.5.5-SNAPSHOT</version>
+      <version>2.5.3.3-SNAPSHOT</version>
    </parent>
 
    <properties>

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java

@@ -485,7 +485,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
-                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
             else
@@ -499,7 +498,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
                                 returnedObject.getResultSetMetaData().getLimitedBy(),
                                 PermissionEvaluationMode.EAGER,
                                 returnedObject.getResultSetMetaData().getSearchParameters()));
-                filteringResultSet.setNumberFound(returnedObject.getNumberFound());
                 return filteringResultSet;
             }
         }

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java

@@ -35,7 +35,6 @@ import java.util.Map;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -52,9 +51,6 @@ public class DispositionScheduleImpl implements DispositionSchedule,
     private NodeService nodeService;
     private RecordsManagementServiceRegistry services;
     private NodeRef dispositionDefinitionNodeRef;
-    /** authentication helper */
-    private AuthenticationUtil authenticationUtil;
-
     
     private List<DispositionActionDefinition> actions;
     private Map<String, DispositionActionDefinition> actionsById;
@@ -66,11 +62,6 @@ public class DispositionScheduleImpl implements DispositionSchedule,
     /** Map of disposition definitions by disposition action name */
     private Map<String, DispositionActionDefinition> actionsByDispositionActionName;
     
-    public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
-    {
-        this.authenticationUtil = authenticationUtil;
-    }
-    
     public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService,  NodeRef nodeRef)
     {
         // TODO check that we have a disposition definition node reference
@@ -109,18 +100,13 @@ public class DispositionScheduleImpl implements DispositionSchedule,
      */
     public boolean isRecordLevelDisposition()
     {
-        return authenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<Boolean>()
+        boolean result = false;
-        {
+        Boolean value = (Boolean)this.nodeService.getProperty(this.dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
-            public Boolean doWork() throws Exception
-            {
-                Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
         if (value != null)
         {
-                    return value.booleanValue();
+            result = value.booleanValue();
         }            
-                return null;
+        return result;
-            }
-        });
     }
 
     /**

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java

@@ -348,9 +348,6 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
         return ds;
     }
 
-
-
-
     /**
      * This method returns a NodeRef
      * Gets the disposition instructions
@@ -383,7 +380,7 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
                 NodeRef result = getAssociatedDispositionScheduleImpl(parent);
                 if (result == null)
                 {
-                    return null;
+                    return getOriginDispositionSchedule(parent);
                 }
                 return new DispositionScheduleImpl(serviceRegistry, nodeService, result);
             }