From 6ab5dce5123e41049d8f12b3e26b7b777d545312 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 30 Oct 2009 14:15:38 +0000 Subject: [PATCH] Merged CMIS063 to HEAD 17009: MOB-1330: Upgrade Web Services Repository to 0.7 17021: CMIS 0.7 upgrade - checkpoint. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/version.properties | 4 ++-- source/java/org/alfresco/cmis/mapping/CMISMapping.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties index ed35ed7563..3d2a7daeb7 100644 --- a/config/alfresco/version.properties +++ b/config/alfresco/version.properties @@ -11,11 +11,11 @@ version.label=r2 # Edition label -version.edition=Community +version.edition=Enterprise # Build number -version.build=@build-number@ +version.build=r17008 # Schema number diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java index fa8e3b2b24..cd483659eb 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java +++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java @@ -319,7 +319,7 @@ public class CMISMapping implements InitializingBean } // Is it an Alfresco type id? - if (typeId.length() < 4 || typeId.charAt(1) != '/') + if (typeId.length() < 4 || typeId.charAt(1) != ':') { throw new AlfrescoRuntimeException("Malformed type id '" + typeId + "'"); } @@ -347,7 +347,7 @@ public class CMISMapping implements InitializingBean CMISTypeId typeId = mapAlfrescoQNameToTypeId.get(typeQName); if (typeId == null) { - String typeIdStr = scope.getLabel() + "/" + typeQName.toPrefixString(serviceRegistry.getNamespaceService()); + String typeIdStr = scope.getLabel() + ":" + typeQName.toPrefixString(serviceRegistry.getNamespaceService()); return new CMISTypeId(scope, typeQName, typeIdStr, typeQName); } else