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

63704: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63576: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59932 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Implementation of org.alfresco.opencmis.mapping.DescriptionProperty added. Register PropertyAccessor only for CMIS 1.1
         63562 : MNT-10161 : cmis:description is not mapped properly for CMIS 1.1 compliance
            - Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64315 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.opencmis.mapping;
+
+import java.io.Serializable;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.opencmis.CMISConnector;
+import org.alfresco.opencmis.dictionary.CMISNodeInfo;
+import org.alfresco.service.ServiceRegistry;
+import org.alfresco.service.namespace.QName;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
+
+/**
+ * Get the CMIS object description property.
+ * 
+ * @author sergey.scherbovich
+ */
+public class DescriptionProperty extends AbstractProperty
+{
+    /**
+     * Construct
+     * 
+     * @param serviceRegistry
+     * @param connector
+     */
+    public DescriptionProperty(ServiceRegistry serviceRegistry, CMISConnector connector)
+    {
+        super(serviceRegistry, connector, PropertyIds.DESCRIPTION);
+    }
+
+    @Override
+    public Serializable getValueInternal(CMISNodeInfo nodeInfo)
+    {
+        return getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(), ContentModel.PROP_DESCRIPTION);
+    }
+
+    @Override
+    public QName getMappedProperty()
+    {
+        return ContentModel.PROP_DESCRIPTION;
+    }
+}

source/java/org/alfresco/opencmis/mapping/RuntimePropertyAccessorMapping.java

@@ -143,7 +143,8 @@ public class RuntimePropertyAccessorMapping implements PropertyAccessorMapping,
         registerPropertyAccessor(new TargetIdProperty(serviceRegistry, cmisConnector));
         if(cmisMapping.getCmisVersion().equals(CmisVersion.CMIS_1_1))
         {
-        	registerPropertyAccessor(new SecondaryTypesProperty(serviceRegistry, cmisConnector, cmisMapping));
+            registerPropertyAccessor(new DescriptionProperty(serviceRegistry, cmisConnector));
+            registerPropertyAccessor(new SecondaryTypesProperty(serviceRegistry, cmisConnector, cmisMapping));
         }
 
         //