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

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

Browse Source 
68111: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65926: MNT-10021: Merged DEV to V4.2-BUG-FIX
         58137: MNT-10021: CMIS 1.0 aspect properties only provide propertyDefinitionId
            - Fields displayName, localName, queryName added into response
         61316: MNT-10021: CMIS 1.0 aspect properties only provide propertyDefinitionId
            - Add unit test for case


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:07:02 +00:00
parent c2c57afa4a
commit c30ffdcab0
2 changed files with 109 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1946,10 +1946,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
* Creates a property extension element.
*/
@SuppressWarnings("rawtypes")
private CmisExtensionElement createAspectPropertyExtension(PropertyDefinition<?> propertyDefintion, Object value)
private CmisExtensionElement createAspectPropertyExtension(PropertyDefinition<?> propertyDefinition, Object value)
{
String name;
switch (propertyDefintion.getPropertyType())
switch (propertyDefinition.getPropertyType())
{
case BOOLEAN:
name = "propertyBoolean";
@@ -1971,7 +1971,19 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
}
Map<String, String> attributes = new HashMap<String, String>();
attributes.put("propertyDefinitionId", propertyDefintion.getId());
attributes.put("propertyDefinitionId", propertyDefinition.getId());
attributes.put("queryName", propertyDefinition.getQueryName());
// optional value
if (propertyDefinition.getDisplayName() !=null && propertyDefinition.getDisplayName().trim().length() > 0)
{
attributes.put("displayName", propertyDefinition.getDisplayName());
}
// optional value
if (propertyDefinition.getLocalName() !=null && propertyDefinition.getLocalName().trim().length() > 0)
{
attributes.put("localName", propertyDefinition.getLocalName());
}
List<CmisExtensionElement> propertyValues = new ArrayList<CmisExtensionElement>();
if (value != null)
@@ -1987,7 +1999,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
}
else
{
logger.warn("Unexpected null entry in list value for property " + propertyDefintion.getDisplayName()
logger.warn("Unexpected null entry in list value for property " + propertyDefinition.getDisplayName()
+ ", value = " + value);
}
}