From e069af2971af301968821a5df42ea5c8b0c30419 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 31 Mar 2014 17:39:34 +0000 Subject: [PATCH] Reverse Merge HEAD (4.3/Cloud) 65769: 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@65984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/opencmis/CMISConnector.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index c829d05561..5807b74e08 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -1369,7 +1369,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); + 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); } Map versionProperties = new HashMap(5); @@ -1382,7 +1385,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); + 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); } Map versionProperties = new HashMap(5);