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

Update to latest Chemistry TCK for new relationship tests

Browse Source 
- also fix relationship issues as found by relationship tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2010-03-02 18:08:21 +00:00
parent 96193a759a
commit cd339edad4
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/model/cmisModel.xml
View File

@@ -334,7 +334,7 @@
<type name="cmis:relationship"> <type name="cmis:relationship">
<title>Relationship</title> <title>Relationship</title>
<description>Relationship Type</description> <description>Relationship Type</description>
<parent>cmis:object</parent> <parent>cmis:filesystemobject</parent>
<properties> <properties>
<property name="cmis:sourceId"> <property name="cmis:sourceId">
<title>Source Id</title> <title>Source Id</title>

1
config/alfresco/public-services-security-context.xml
View File

@@ -378,6 +378,7 @@
org.alfresco.service.cmr.repository.NodeService.removeAssociation=ACL_ALLOW org.alfresco.service.cmr.repository.NodeService.removeAssociation=ACL_ALLOW
org.alfresco.service.cmr.repository.NodeService.getTargetAssocs=ACL_ALLOW org.alfresco.service.cmr.repository.NodeService.getTargetAssocs=ACL_ALLOW
org.alfresco.service.cmr.repository.NodeService.getSourceAssocs=ACL_ALLOW org.alfresco.service.cmr.repository.NodeService.getSourceAssocs=ACL_ALLOW
org.alfresco.service.cmr.repository.NodeService.getAssoc=ACL_ALLOW
org.alfresco.service.cmr.repository.NodeService.getPath=ACL_NODE.0.sys:base.ReadProperties org.alfresco.service.cmr.repository.NodeService.getPath=ACL_NODE.0.sys:base.ReadProperties
org.alfresco.service.cmr.repository.NodeService.getPaths=ACL_NODE.0.sys:base.ReadProperties org.alfresco.service.cmr.repository.NodeService.getPaths=ACL_NODE.0.sys:base.ReadProperties
org.alfresco.service.cmr.repository.NodeService.getStoreArchiveNode=ACL_NODE.0.sys:base.Read org.alfresco.service.cmr.repository.NodeService.getStoreArchiveNode=ACL_NODE.0.sys:base.Read

20
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -1129,7 +1129,7 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
} }
Object object = getReadableObject(objectId, Object.class); Object object = getReadableObject(objectId, Object.class);
NodeRef result; Object result;
// Map version nodes back to their source node // Map version nodes back to their source node
if (object instanceof Version) if (object instanceof Version)
{ {
@@ -1148,14 +1148,22 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
{ {
result = nodeRef; result = nodeRef;
} }
if (isVersionable)
{
validateVersionable((NodeRef)result);
}
}
else if (requiredType.isAssignableFrom(object.getClass()))
{
if (isVersionable)
{
throw new CMISConstraintException(objectId + " is not versionable");
}
result = object;
} }
else else
{ {
throw new CMISConstraintException("Object " + objectId + " is not of required type"); throw new CMISConstraintException("Object " + objectId + " is not of required type");
}
if (isVersionable)
{
validateVersionable(result);
} }
return (T)result; return (T)result;
} }