From aeb47c1ed552b6586eb2f9b0df3560ef255769ed Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 10:40:34 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 89523: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 89431: MNT-12242: Merged V4.2.3 (4.2.3.6) to V4.2-BUG-FIX (4.2.4) << Still requires more unit tests to be added >> 89177: MNT-12622 : Merged DEV to PATHCES\V4.2.3 (4.2.3.6) 83657 : MNT-12242 : Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call - Do not create version on CMIS update properties explicitly 89184: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call - Create MAJOR version on content update if autoVersion==true 89236: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call - Create MINOR version on content update if autoVersion==true 89258: MNT-12622 : CLONE - Alfresco "autoVersionOnUpdateProps=false" does not work properly when making a CMIS call - Correcting comment to match to the actual behaviour git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/opencmis/AlfrescoCmisServiceImpl.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java index 7f11484059..2c923aa56f 100644 --- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java +++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java @@ -1441,12 +1441,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr removeTempFile(tempFile); } - // MNT-10176 Cmisaction:setContent; The properties don't update. - if (connector.getNodeService().exists(nodeRef) && connector.getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) - { - connector.createVersion(nodeRef, VersionType.MINOR, "Set content stream"); - } - objectId.setValue(connector.createObjectId(nodeRef)); connector.getActivityPoster().postFileFolderUpdated(info.isFolder(), nodeRef); @@ -1555,12 +1549,6 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr connector.setProperties(nodeRef, info.getType(), properties, new String[0]); - // MNT-10176 Cmisaction:setContent; The properties don't update. - if(connector.getNodeService().exists(nodeRef) && connector.getNodeService().hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) - { - connector.createVersion(nodeRef, VersionType.MINOR, "Update properties"); - } - objectId.setValue(connector.createObjectId(nodeRef)); boolean isObjectInfoRequired = getContext().isObjectInfoRequired();