RM-5927 Check version nbrs and remove appliesTo

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-context.xml

@@ -46,6 +46,7 @@
       <property name="retryingTransactionHelper" ref="retryingTransactionHelper"/>
       <property name="behaviourFilter" ref="policyBehaviourFilter" />
       <property name="modulePatchExecuter" ref="rm.modulePatchExecuter" />
+      <property name="registryService" ref="registryService" />
    </bean>
 
 </beans>

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v20-context.xml

@@ -13,7 +13,6 @@
       <property name="description" value="Patches new versions of the notification templates."/>
       <property name="sinceVersion" value="2.0"/>
       <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.0.999"/>
       <property name="nodeService" ref="NodeService"/>
       <property name="notificationHelper" ref="recordsManagementNotificationHelper"/>
       <property name="contentService" ref="ContentService"/>
@@ -29,7 +28,6 @@
       <property name="description" value="Patches the existing RM data for the RM v2.0 model updates."/>
       <property name="sinceVersion" value="2.0"/>
       <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.0.999"/>
       <property name="patchDAO" ref="patchDAO"/>
       <property name="nodeDAO" ref="nodeDAO" />
       <property name="qnameDAO" ref="qnameDAO"/>
@@ -43,7 +41,6 @@
       <property name="description" value="Patches the existing RM data with the root file plan values."/>
       <property name="sinceVersion" value="2.0"/>
       <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.0.999"/>
       <property name="patchDAO" ref="patchDAO"/>
       <property name="nodeDAO" ref="nodeDAO" />
       <property name="qnameDAO" ref="qnameDAO"/>
@@ -61,7 +58,6 @@
       <property name="description" value="Patches the existing saved seaches."/>
       <property name="sinceVersion" value="2.0"/>
       <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.0.999"/>
       <property name="recordsManagementSearchService" ref="RecordsManagementSearchService" />
       <property name="siteService" ref="SiteService" />
       <property name="contentService" ref="ContentService"/>

rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v21-context.xml

@@ -12,8 +12,7 @@
       <property name="name" value="org_alfresco_module_rm_notificationTemplatePatch_v21"/>
       <property name="description" value="Patches new versions of the notification templates."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="dependsOn">
          <list>
             <ref bean="org_alfresco_module_rm_bootstrapData" />
@@ -31,8 +30,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21InPlacePatch"/>
       <property name="description" value="Patches the existing RM data for the RM v2.1 InPlace features."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="filePlanRoleService" ref="FilePlanRoleService"/>
       <property name="filePlanPermissionService" ref="FilePlanPermissionService"/>
       <property name="filePlanService" ref="FilePlanService"/>
@@ -48,8 +46,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21CapabilityPatch"/>
       <property name="description" value="Patches the existing RM data for the RM v2.1 updated capabilities."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="filePlanService" ref="FilePlanService"/>
       <property name="authorityService" ref="authorityService"/>
       <property name="permissionService" ref="permissionService"/>
@@ -62,8 +59,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21RecordInheritancePatch"/>
       <property name="description" value="Adjust record permission inheritance."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="patchDAO" ref="patchDAO"/>
       <property name="nodeDAO" ref="nodeDAO" />
       <property name="qnameDAO" ref="qnameDAO"/>
@@ -78,8 +74,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21RolesPatch"/>
       <property name="description" value="Add existing roles to the rm zone."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="filePlanService" ref="FilePlanService"/>
       <property name="filePlanRoleService" ref="FilePlanRoleService"/>
       <property name="authorityService" ref="AuthorityService"></property>
@@ -92,8 +87,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21ReportServicePatch"/>
       <property name="description" value="Add report service templates."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="contentService" ref="ContentService" />
       <property name="nodeService" ref="NodeService" />
    </bean>
@@ -105,8 +99,7 @@
       <property name="name" value="org_alfresco_module_rm_RMv21BehaviorScriptsPatch"/>
       <property name="description" value="Move existing behavior scripts to their dedicated behavior folder, freeing existing scripts folder up for non-behavior RM scripts."/>
       <property name="sinceVersion" value="2.1"/>
-      <property name="appliesFromVersion" value="2.0"/>
-      <property name="appliesToVersion" value="2.1.999"/>
+      <property name="appliesFromVersion" value="2.1"/>
       <property name="fileFolderService" ref="FileFolderService"/>
       <property name="nodeService" ref="NodeService"/>
    </bean>

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/compatibility/ModulePatchComponent.java

@@ -27,10 +27,17 @@
 
 package org.alfresco.module.org_alfresco_module_rm.patch.compatibility;
 
+import java.io.Serializable;
+
 import org.alfresco.module.org_alfresco_module_rm.patch.ModulePatchExecuterImpl;
+import org.alfresco.repo.admin.registry.RegistryKey;
+import org.alfresco.repo.admin.registry.RegistryService;
 import org.alfresco.repo.module.AbstractModuleComponent;
+import org.alfresco.repo.module.ModuleComponentHelper;
+import org.alfresco.repo.module.ModuleVersionNumber;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.module.ModuleDetails;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -44,6 +51,10 @@ import org.apache.commons.logging.LogFactory;
 @Deprecated
 public abstract class ModulePatchComponent extends AbstractModuleComponent
 {
+    private static final String REGISTRY_PATH_MODULES = "modules";
+    private static final String REGISTRY_PROPERTY_INSTALLED_VERSION = "installedVersion";
+    private static final String REGISTRY_PROPERTY_CURRENT_VERSION = "currentVersion";
+    
     /** logger */
     protected static final Log LOGGER = LogFactory.getLog(ModulePatchComponent.class);
 
@@ -80,6 +91,14 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
         this.modulePatchExecuter = modulePatchExecuter;
     }
 
+    /**
+     * @param registryService   Registry service
+     */
+    protected RegistryService registryService;
+    public void setRegistryService(RegistryService registryService) {
+        this.registryService = registryService;
+    }
+
     /**
      * Init method
      */
@@ -96,6 +115,28 @@ public abstract class ModulePatchComponent extends AbstractModuleComponent
     @Override
     protected void executeInternal()
     {
+        String moduleId = modulePatchExecuter.getModuleId();
+
+        RegistryKey moduleKeyInstalledVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0,
+                new String[]{REGISTRY_PATH_MODULES, moduleId, REGISTRY_PROPERTY_INSTALLED_VERSION});
+        Serializable moduleInstalledVersion = this.registryService.getProperty(moduleKeyInstalledVersion);
+        ModuleVersionNumber moduleInstalledVersionNumber = new ModuleVersionNumber(moduleInstalledVersion.toString());
+
+        RegistryKey moduleKeyCurrentVersion = new RegistryKey(ModuleComponentHelper.URI_MODULES_1_0,
+                new String[]{REGISTRY_PATH_MODULES, moduleId, REGISTRY_PROPERTY_CURRENT_VERSION});
+        Serializable moduleCurrentVersion = this.registryService.getProperty(moduleKeyCurrentVersion);
+        ModuleVersionNumber moduleCurrentVersionNumber = new ModuleVersionNumber(moduleInstalledVersion.toString());
+
+        ModuleDetails moduleDetails = moduleService.getModule(moduleId);
+        ModuleVersionNumber moduleNewVersion = moduleDetails.getModuleVersionNumber();
+        
+        LOGGER.debug("******************************************************************");
+        LOGGER.debug("    moduleCurrentVersion  : " + moduleCurrentVersion.toString());
+        LOGGER.debug("             versionNumber: " + moduleCurrentVersionNumber.toString());
+        LOGGER.debug("    moduleInstalledVersion: " + moduleInstalledVersion.toString());
+        LOGGER.debug("             versionNumber: " + moduleInstalledVersionNumber.toString());
+        LOGGER.debug("    moduleNewVersionNumber: " + moduleNewVersion.toString());
+
         try
         {
             if (LOGGER.isInfoEnabled())