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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << And added alfresco-opencmis-extension 1.0 >>
      79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
            rather than the changes from V4.2-BUG-FIX >>
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 15:29:34 +00:00
parent 10ff05205d
commit 8023f9dd44
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -274,12 +274,10 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.5.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.beanshell</groupId> <groupId>org.beanshell</groupId>
@@ -392,6 +390,10 @@
<groupId>woodstox</groupId> <groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId> <artifactId>wstx-asl</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

8
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -3961,17 +3961,17 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
PermissionDefinitionDataImpl cmisPermission; PermissionDefinitionDataImpl cmisPermission;
cmisPermission = new PermissionDefinitionDataImpl(); cmisPermission = new PermissionDefinitionDataImpl();
cmisPermission.setPermission(BasicPermissions.READ); cmisPermission.setId(BasicPermissions.READ);
cmisPermission.setDescription("CMIS Read"); cmisPermission.setDescription("CMIS Read");
result.add(cmisPermission); result.add(cmisPermission);
cmisPermission = new PermissionDefinitionDataImpl(); cmisPermission = new PermissionDefinitionDataImpl();
cmisPermission.setPermission(BasicPermissions.WRITE); cmisPermission.setId(BasicPermissions.WRITE);
cmisPermission.setDescription("CMIS Write"); cmisPermission.setDescription("CMIS Write");
result.add(cmisPermission); result.add(cmisPermission);
cmisPermission = new PermissionDefinitionDataImpl(); cmisPermission = new PermissionDefinitionDataImpl();
cmisPermission.setPermission(BasicPermissions.ALL); cmisPermission.setId(BasicPermissions.ALL);
cmisPermission.setDescription("CMIS All"); cmisPermission.setDescription("CMIS All");
result.add(cmisPermission); result.add(cmisPermission);
@@ -3981,7 +3981,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
private PermissionDefinition createPermissionDefinition(PermissionReference pr) private PermissionDefinition createPermissionDefinition(PermissionReference pr)
{ {
PermissionDefinitionDataImpl permission = new PermissionDefinitionDataImpl(); PermissionDefinitionDataImpl permission = new PermissionDefinitionDataImpl();
permission.setPermission(pr.getQName().toString() + "." + pr.getName()); permission.setId(pr.getQName().toString() + "." + pr.getName());
permission.setDescription(permission.getId()); permission.setDescription(permission.getId());
return permission; return permission;