From 56d2873681073250ef1d3a4638decb7245f9b1c1 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 30 Oct 2009 23:56:26 +0000 Subject: [PATCH] Merged CMIS063 to HEAD Resolve merge issues. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/cmis/mapping/CMISPropertyServiceTest.java | 4 ++-- source/java/org/alfresco/cmis/mapping/PathProperty.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java index e23afa6f36..938112ae02 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java +++ b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java @@ -626,7 +626,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties); properties = cmisService.getProperties(content); - assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_ID), content.toString()+"/1.0"); + assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_ID), content.toString()+";1.0"); assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId()); assertEquals(properties.get(CMISDictionaryModel.PROP_BASE_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId()); assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName()); @@ -706,7 +706,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties); properties = cmisService.getProperties(content); - assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_ID), content.toString()+"/1.1"); + assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_ID), content.toString()+";1.1"); assertEquals(properties.get(CMISDictionaryModel.PROP_OBJECT_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId()); assertEquals(properties.get(CMISDictionaryModel.PROP_BASE_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId()); assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName()); diff --git a/source/java/org/alfresco/cmis/mapping/PathProperty.java b/source/java/org/alfresco/cmis/mapping/PathProperty.java index f3ccda4feb..a39839cb5e 100644 --- a/source/java/org/alfresco/cmis/mapping/PathProperty.java +++ b/source/java/org/alfresco/cmis/mapping/PathProperty.java @@ -28,7 +28,6 @@ import java.io.Serializable; import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISServices; -import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.ChildAssociationRef; @@ -91,7 +90,8 @@ public class PathProperty extends AbstractProperty if (i == path.size()) { - throw new AlfrescoRuntimeException("Path " + path + " not in CMIS root node scope"); + // TODO: + //throw new AlfrescoRuntimeException("Path " + path + " not in CMIS root node scope"); } if (path.size() - i == 1)