inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-2.5/Merge_RM4320_to_V2.5' into 'release/V2.5'

Browse Source 
Feature 2.5/merge rm4320 to v2.5

See merge request !651
This commit is contained in:
Mihai Cozma
2016-11-25 09:25:09 +00:00
parent 80b2fcdd90 fa56fca9f6
commit e6f55df382
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -103,6 +103,7 @@
<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>
@@ -153,9 +154,9 @@
<regexPropertySettings>
<regexPropertySetting>
<name>rm.module.repo.version.min</name>
<value>${alfresco.version}</value>
- <regex>(\d+)\.(\d+).*</regex>
- <replacement>$1.$2</replacement>
<value>${alfresco.repo.version.min}</value>
- <regex>([0-9\.]*[0-9]).*</regex>
- <replacement>$1</replacement>
<failIfNoMatch>false</failIfNoMatch>
</regexPropertySetting>
<regexPropertySetting>

3
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
View File

@@ -136,9 +136,6 @@
<property name="nodeService">
<ref bean="nodeService"></ref>
</property>
<property name="authenticationService">
<ref bean="authenticationService"/>
</property>
<property name="maxPermissionCheckTimeMillis">
<value>${system.acl.maxPermissionCheckTimeMillis}</value>
</property>

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
View File

@@ -127,6 +127,7 @@ 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