From 8097a243caf5f4d88577aa4464e9ecaee5c24e29 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 3 Sep 2014 15:17:48 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    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@82692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                                              | 6 ++----
 source/java/org/alfresco/opencmis/CMISConnector.java | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65345ea243..ce3c853358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,10 +274,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <version>1.5.11</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.11</version>
         </dependency>
         <dependency>
             <groupId>org.beanshell</groupId>
@@ -390,10 +392,6 @@
                     <groupId>woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index b0417b5336..39134a404e 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -3961,17 +3961,17 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
         PermissionDefinitionDataImpl cmisPermission;
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.READ);
+        cmisPermission.setPermission(BasicPermissions.READ);
         cmisPermission.setDescription("CMIS Read");
         result.add(cmisPermission);
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.WRITE);
+        cmisPermission.setPermission(BasicPermissions.WRITE);
         cmisPermission.setDescription("CMIS Write");
         result.add(cmisPermission);
 
         cmisPermission = new PermissionDefinitionDataImpl();
-        cmisPermission.setId(BasicPermissions.ALL);
+        cmisPermission.setPermission(BasicPermissions.ALL);
         cmisPermission.setDescription("CMIS All");
         result.add(cmisPermission);
 
@@ -3981,7 +3981,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     private PermissionDefinition createPermissionDefinition(PermissionReference pr)
     {
         PermissionDefinitionDataImpl permission = new PermissionDefinitionDataImpl();
-        permission.setId(pr.getQName().toString() + "." + pr.getName());
+        permission.setPermission(pr.getQName().toString() + "." + pr.getName());
         permission.setDescription(permission.getId());
 
         return permission;