From 44c336dd5027c3d40d9663a433629b54e0729851 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Wed, 5 May 2010 16:21:09 +0000 Subject: [PATCH] Fix re-opened ALF-2637: "objectTypeId" updatability reported as "readonly" rather then "oncreate" git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/cmis/ws/DMRepositoryServicePort.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java index 2050fa1e6e..6242e40629 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java @@ -87,6 +87,7 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re UPDATABILITY_ENUM_MAPPING.put(CMISUpdatabilityEnum.READ_AND_WRITE, EnumUpdatability.READWRITE); UPDATABILITY_ENUM_MAPPING.put(CMISUpdatabilityEnum.READ_AND_WRITE_WHEN_CHECKED_OUT, EnumUpdatability.WHENCHECKEDOUT); UPDATABILITY_ENUM_MAPPING.put(CMISUpdatabilityEnum.READ_ONLY, EnumUpdatability.READONLY); + UPDATABILITY_ENUM_MAPPING.put(CMISUpdatabilityEnum.ON_CREATE, EnumUpdatability.ONCREATE); CARDINALITY_ENUM_MAPPING = new HashMap(); CARDINALITY_ENUM_MAPPING.put(CMISCardinalityEnum.MULTI_VALUED, EnumCardinality.MULTI); @@ -450,14 +451,15 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re { checkRepositoryId(repositoryId); - Descriptor serverDescriptor = descriptorService.getCurrentRepositoryDescriptor(); + Descriptor currentDescriptor = descriptorService.getCurrentRepositoryDescriptor(); + Descriptor serverDescriptor = descriptorService.getServerDescriptor(); CmisRepositoryInfoType repositoryInfoType = new CmisRepositoryInfoType(); - repositoryInfoType.setRepositoryId(serverDescriptor.getId()); - repositoryInfoType.setRepositoryName(serverDescriptor.getName()); + repositoryInfoType.setRepositoryId(currentDescriptor.getId()); + repositoryInfoType.setRepositoryName(currentDescriptor.getName()); repositoryInfoType.setRepositoryDescription(""); repositoryInfoType.setVendorName("Alfresco"); repositoryInfoType.setProductName("Alfresco Repository (" + serverDescriptor.getEdition() + ")"); - repositoryInfoType.setProductVersion(serverDescriptor.getVersion()); + repositoryInfoType.setProductVersion(currentDescriptor.getVersion()); try { repositoryInfoType.setRootFolderId(propertiesUtil.getProperty(cmisService.getDefaultRootNodeRef(), CMISDictionaryModel.PROP_OBJECT_ID, (String) null));