From 3ba3b255cf32f00d6658396d37f70f57b4d6cb3f Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 3 Sep 2014 15:16:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 79113: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 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. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/opencmis/CMISConnector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index 39134a404e..b0417b5336 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.setPermission(BasicPermissions.READ); + cmisPermission.setId(BasicPermissions.READ); cmisPermission.setDescription("CMIS Read"); result.add(cmisPermission); cmisPermission = new PermissionDefinitionDataImpl(); - cmisPermission.setPermission(BasicPermissions.WRITE); + cmisPermission.setId(BasicPermissions.WRITE); cmisPermission.setDescription("CMIS Write"); result.add(cmisPermission); cmisPermission = new PermissionDefinitionDataImpl(); - cmisPermission.setPermission(BasicPermissions.ALL); + cmisPermission.setId(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.setPermission(pr.getQName().toString() + "." + pr.getName()); + permission.setId(pr.getQName().toString() + "." + pr.getName()); permission.setDescription(permission.getId()); return permission;