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

Merged DEV/CMIS0_61 to HEAD (part 2)

Browse Source 
14002 Removed use of Headers as arguments in CMIS AtomPub binding
  - as removed in CMIS 0.6 spec
  - removed associated tests
  - fixed encoding issue in web script test harness logging
  - removed very old .XSDs that were lying around
 14006 Obsolete.
 14022 Suport for multi-valued properties in CMIS AtomPub binding
  - support in all read, write and query methods
  - added multi-valued tests to CMISCustomTypeTest
  - fix workaround for null property values in CMIS freemarker template
  - update to Abdera CMIS Extension to handle multi-valued properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-05-01 20:40:35 +00:00
parent 488f3c2e80
commit 9379d6e414
34 changed files with 1474 additions and 3583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/cmis/rest/CMISPropertyValueMethod.java
View File

@@ -30,7 +30,9 @@ import org.alfresco.cmis.CMISServices;
import org.alfresco.repo.template.TemplateNode;
import freemarker.ext.beans.BeanModel;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
import freemarker.template.TemplateScalarModel;
@@ -45,8 +47,14 @@ import freemarker.template.TemplateScalarModel;
*/
public final class CMISPropertyValueMethod implements TemplateMethodModelEx
{
private CMISServices cmisService;
/**
* NULL value marker
*/
public static class NULL {};
public static TemplateModel IS_NULL = new BeanModel(new NULL(), BeansWrapper.getDefaultInstance());
private CMISServices cmisService;
/**
* Construct
*/
@@ -89,6 +97,6 @@ public final class CMISPropertyValueMethod implements TemplateMethodModelEx
}
}
return result;
return result == null ? IS_NULL : result;
}
}