From 354ba7b12ebfbd41e735734eb4101414af5137b7 Mon Sep 17 00:00:00 2001 From: Pavel Yurke Date: Fri, 28 Mar 2014 09:03:15 +0000 Subject: [PATCH] Merged DEV to HEAD (4.3) 65652 : ACE-1131 : Cmisaction:deleteContent: Inconsistency in versioning behaviour for documents created via Cmis and Share - Set versionable aspect properties to default values when applying versionable state via CMIS git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@65769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/opencmis/CMISConnector.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index 5807b74e08..c829d05561 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -1369,10 +1369,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - Map props = new HashMap(); - props.put(ContentModel.PROP_INITIAL_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION, false); - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); } Map versionProperties = new HashMap(5); @@ -1385,10 +1382,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - Map props = new HashMap(); - props.put(ContentModel.PROP_INITIAL_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION, false); - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); } Map versionProperties = new HashMap(5);