From 46ebbbf9fc93bbb1a360d9faefa583aafea5befa Mon Sep 17 00:00:00 2001
From: Mihai Cozma <mihai.cozma@savatech.ro>
Date: Fri, 25 Nov 2016 16:11:24 +0200
Subject: [PATCH] Revert "Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into
 'release/V2.5'"

This reverts commit e6f55df3821f52aaf7cd84e4ed5dbaaf910a334e, reversing
changes made to d90c19522e8844ef8a11d2af3f84891bbe1bf71a.
---
 pom.xml                                                    | 7 +++----
 .../rm-public-services-security-context.xml                | 3 +++
 .../security/rm-method-security.properties                 | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b7bd6f8c0..a713d01aed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,6 @@
 
    <properties>
       <alfresco.rm.version>${project.version}</alfresco.rm.version>
-      <alfresco.repo.version.min>5.1.1</alfresco.repo.version.min>
       <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
       <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
       <maven.build.sourceVersion>1.7</maven.build.sourceVersion>
@@ -154,9 +153,9 @@
                      <regexPropertySettings>
                         <regexPropertySetting>
                            <name>rm.module.repo.version.min</name>
-                           <value>${alfresco.repo.version.min}</value>
--                           <regex>([0-9\.]*[0-9]).*</regex>
--                           <replacement>$1</replacement>
+                           <value>${alfresco.version}</value>
+-                           <regex>(\d+)\.(\d+).*</regex>
+-                           <replacement>$1.$2</replacement>
                            <failIfNoMatch>false</failIfNoMatch>
                         </regexPropertySetting>
                         <regexPropertySetting>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
index 6d90759e2b..8b773b3c9b 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
@@ -136,6 +136,9 @@
         <property name="nodeService">
             <ref bean="nodeService"></ref>
         </property>
+        <property name="authenticationService">
+            <ref bean="authenticationService"/>
+        </property>
         <property name="maxPermissionCheckTimeMillis">
             <value>${system.acl.maxPermissionCheckTimeMillis}</value>
         </property>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
index 6a5bfac349..350505fa84 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
@@ -127,7 +127,6 @@ rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockStatus=RM.Rea
 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLockType=RM.Read.0
 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.checkForLock=RM.Read.0
 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.getLocks=RM.Read.0
-rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.isLockedAndReadOnly=RM.Read.0
 rm.methodsecurity.org.alfresco.service.cmr.lock.LockService.*=RM_DENY
 
 ## Multilingual Content Service