From fedb8d2071491c2b98dd7a7b7645587cba919259 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 17 Sep 2010 09:02:09 +0000 Subject: [PATCH] Resolve ALF4822, ALF4818 - ALF-4822 CMIS: Web service binding returning the wrong query name - ALF-4818 The inherited flag is set to "true" on all CMIS property definitions (Web Services binding only) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java index b68f372656..ac5943854b 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java @@ -156,7 +156,7 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re wsPropertyDef.setPropertyType(PROPERTY_TYPE_ENUM_MAPPING.get(propertyDefinition.getDataType())); wsPropertyDef.setCardinality(CARDINALITY_ENUM_MAPPING.get(propertyDefinition.getCardinality())); wsPropertyDef.setUpdatability(UPDATABILITY_ENUM_MAPPING.get(propertyDefinition.getUpdatability())); - wsPropertyDef.setInherited(!typeDefinition.getOwnedPropertyDefinitions().containsKey(propertyDefinition.getPropertyId())); + wsPropertyDef.setInherited(!typeDefinition.getOwnedPropertyDefinitions().containsKey(propertyDefinition.getPropertyId().getId())); wsPropertyDef.setRequired(propertyDefinition.isRequired()); wsPropertyDef.setQueryable(propertyDefinition.isQueryable()); wsPropertyDef.setOrderable(propertyDefinition.isOrderable()); @@ -344,7 +344,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId()); } - cmisTypeDefinition.setQueryName(typeDefinition.getBaseType().getQueryName()); cmisTypeDefinition.setDescription(typeDefinition.getDescription()); cmisTypeDefinition.setCreatable(typeDefinition.isCreatable()); cmisTypeDefinition.setFileable(typeDefinition.isFileable());