inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
100852: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      100763: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         100041: MNT-13692: Reverse Merge V4.2-BUG-FIX (4.2.5)
            <<Merge 99879 caused failures on build #898>>
            99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
               99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-31 23:16:06 +00:00
parent 352c439f98
commit 6c78af5165
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/opencmis/CMISConnector.java
View File

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