From e89f432587d0fa4011155d3894c4608d6e05a19a Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Wed, 14 Nov 2012 13:56:19 +0000 Subject: [PATCH] Fix for ALF-16785 CMIS 0.8 TCK - acl propagation test fails git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/opencmis/AlfrescoCmisServiceImpl.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java index 0b59f708fb..a35e42c119 100644 --- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java +++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java @@ -1129,7 +1129,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr final Acl addAces, final Acl removeAces, ExtensionsData extension) { checkRepositoryId(repositoryId); - + // get the parent folder node ref final CMISNodeInfo parentInfo = getOrCreateFolderInfo(folderId, "Parent folder"); @@ -1163,6 +1163,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr } // copy stream to temp file + // OpenCMIS does this for us .... final File tempFile = copyToTempFile(contentStream); final Charset encoding = (tempFile == null ? null : getEncoding(tempFile, contentStream.getMimeType())); @@ -2281,10 +2282,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr { checkRepositoryId(repositoryId); - if (aclPropagation == AclPropagation.OBJECTONLY) - { - throw new CmisInvalidArgumentException("ACL propagation 'objectonly' is not supported!"); - } + // We are spec compliant if we just let it through and the tck will not fail CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object"); @@ -2307,10 +2305,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr { checkRepositoryId(repositoryId); - if (aclPropagation == AclPropagation.OBJECTONLY) - { - throw new CmisInvalidArgumentException("ACL propagation 'objectonly' is not supported!"); - } + // We are spec compliant if we just let it through and the tck will not fail CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object");