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
This commit is contained in:
Pavel Yurke
2014-03-28 09:03:15 +00:00
parent 5faabc94d8
commit 354ba7b12e

View File

@@ -1369,10 +1369,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{ {
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
{ {
Map<QName, Serializable> props = new HashMap<QName, Serializable>(); nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
props.put(ContentModel.PROP_INITIAL_VERSION, false);
props.put(ContentModel.PROP_AUTO_VERSION, false);
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props);
} }
Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5); Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5);
@@ -1385,10 +1382,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{ {
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
{ {
Map<QName, Serializable> props = new HashMap<QName, Serializable>(); nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
props.put(ContentModel.PROP_INITIAL_VERSION, false);
props.put(ContentModel.PROP_AUTO_VERSION, false);
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props);
} }
Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5); Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5);