inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged CMIS063 to HEAD

Browse Source 
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
This commit is contained in:
David Caruana
2009-10-30 14:15:38 +00:00
parent fe28e22f3e
commit 6ab5dce512
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/version.properties
View File

@@ -11,11 +11,11 @@ version.label=r2
# Edition label # Edition label
version.edition=Community version.edition=Enterprise
# Build number # Build number
version.build=@build-number@ version.build=r17008
# Schema number # Schema number

4
source/java/org/alfresco/cmis/mapping/CMISMapping.java
View File

@@ -319,7 +319,7 @@ public class CMISMapping implements InitializingBean
} }
// Is it an Alfresco type id? // 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 + "'"); throw new AlfrescoRuntimeException("Malformed type id '" + typeId + "'");
} }
@@ -347,7 +347,7 @@ public class CMISMapping implements InitializingBean
CMISTypeId typeId = mapAlfrescoQNameToTypeId.get(typeQName); CMISTypeId typeId = mapAlfrescoQNameToTypeId.get(typeQName);
if (typeId == null) 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); return new CMISTypeId(scope, typeQName, typeIdStr, typeQName);
} }
else else