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 
Resolve merge issues.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-10-30 23:56:26 +00:00
parent 9cafc890c4
commit 56d2873681
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -626,7 +626,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest
serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties); serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties);
properties = cmisService.getProperties(content); 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_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_BASE_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId());
assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName()); assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName());
@@ -706,7 +706,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest
serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties); serviceRegistry.getCheckOutCheckInService().checkin(pwc, versionProperties);
properties = cmisService.getProperties(content); 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_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_BASE_TYPE_ID), CMISDictionaryModel.DOCUMENT_TYPE_ID.getId());
assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName()); assertEquals(properties.get(CMISDictionaryModel.PROP_CREATED_BY), authenticationComponent.getCurrentUserName());

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

@@ -28,7 +28,6 @@ import java.io.Serializable;
import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.CMISServices; import org.alfresco.cmis.CMISServices;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -91,7 +90,8 @@ public class PathProperty extends AbstractProperty
if (i == path.size()) 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) if (path.size() - i == 1)