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

Fix for ALF-16785 CMIS 0.8 TCK - acl propagation test fails

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2012-11-14 13:56:19 +00:00
parent 37e8680261
commit e89f432587
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -1129,7 +1129,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
final Acl addAces, final Acl removeAces, ExtensionsData extension) final Acl addAces, final Acl removeAces, ExtensionsData extension)
{ {
checkRepositoryId(repositoryId); checkRepositoryId(repositoryId);
// get the parent folder node ref // get the parent folder node ref
final CMISNodeInfo parentInfo = getOrCreateFolderInfo(folderId, "Parent folder"); final CMISNodeInfo parentInfo = getOrCreateFolderInfo(folderId, "Parent folder");
@@ -1163,6 +1163,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
} }
// copy stream to temp file // copy stream to temp file
// OpenCMIS does this for us ....
final File tempFile = copyToTempFile(contentStream); final File tempFile = copyToTempFile(contentStream);
final Charset encoding = (tempFile == null ? null : getEncoding(tempFile, contentStream.getMimeType())); final Charset encoding = (tempFile == null ? null : getEncoding(tempFile, contentStream.getMimeType()));
@@ -2281,10 +2282,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
{ {
checkRepositoryId(repositoryId); checkRepositoryId(repositoryId);
if (aclPropagation == AclPropagation.OBJECTONLY) // We are spec compliant if we just let it through and the tck will not fail
{
throw new CmisInvalidArgumentException("ACL propagation 'objectonly' is not supported!");
}
CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object"); CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object");
@@ -2307,10 +2305,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
{ {
checkRepositoryId(repositoryId); checkRepositoryId(repositoryId);
if (aclPropagation == AclPropagation.OBJECTONLY) // We are spec compliant if we just let it through and the tck will not fail
{
throw new CmisInvalidArgumentException("ACL propagation 'objectonly' is not supported!");
}
CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object"); CMISNodeInfo info = getOrCreateNodeInfo(objectId, "Object");