diff --git a/pom.xml b/pom.xml index 65345ea243..ce3c853358 100644 --- a/pom.xml +++ b/pom.xml @@ -274,10 +274,12 @@ org.slf4j slf4j-api + 1.5.11 org.slf4j slf4j-log4j12 + 1.5.11 org.beanshell @@ -390,10 +392,6 @@ woodstox wstx-asl - - org.codehaus.woodstox - wstx-asl - 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;