diff --git a/config/alfresco/cmis-api-context.xml b/config/alfresco/cmis-api-context.xml index 09ba166b9e..d4c3f7d580 100644 --- a/config/alfresco/cmis-api-context.xml +++ b/config/alfresco/cmis-api-context.xml @@ -3,32 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -39,7 +13,8 @@ - 0.7 + 1.0 + Version 1.0 Committee Draft 04 workspace://SpacesStore /Company Home @@ -93,10 +68,37 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -123,7 +125,5 @@ - - \ No newline at end of file diff --git a/config/alfresco/model/cmisModel.xml b/config/alfresco/model/cmisModel.xml index 8de392f80b..216d15f841 100644 --- a/config/alfresco/model/cmisModel.xml +++ b/config/alfresco/model/cmisModel.xml @@ -9,7 +9,7 @@ - + diff --git a/source/java/org/alfresco/cmis/CMISServices.java b/source/java/org/alfresco/cmis/CMISServices.java index 29a342f55d..8fbc146954 100644 --- a/source/java/org/alfresco/cmis/CMISServices.java +++ b/source/java/org/alfresco/cmis/CMISServices.java @@ -45,6 +45,13 @@ public interface CMISServices * @return version of CMIS specification supported */ public String getCMISVersion(); + + /** + * Gets the supported CMIS Specification Title + * + * @return CMIS pecification Title + */ + public String getCMISSpecTitle(); /** * Gets the default root node path diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java index cd483659eb..f846f14c20 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java +++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java @@ -65,7 +65,7 @@ public class CMISMapping implements InitializingBean * The Alfresco CMIS Namespace */ public static String CMIS_MODEL_NS = "cmis"; - public static String CMIS_MODEL_URI = "http://www.alfresco.org/model/cmis/0.62"; + public static String CMIS_MODEL_URI = "http://www.alfresco.org/model/cmis/1.0/cd04"; /** * The Alfresco CMIS Model name. @@ -225,6 +225,7 @@ public class CMISMapping implements InitializingBean registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES)); + registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_FOLDER_TREE, PermissionService.READ_CHILDREN)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_RELATIONSHIPS, true)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_PARENTS, true)); diff --git a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java index c255882bd3..666517876c 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java +++ b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java @@ -114,6 +114,7 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware, // CMIS supported version private String cmisVersion = "[undefined]"; + private String cmisSpecTitle = "[undefined]"; // default CMIS store and path private StoreRef defaultStoreRef; @@ -135,6 +136,16 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware, this.cmisVersion = cmisVersion; } + /** + * Sets the CMIS specification title + * + * @param cmisTitle + */ + public void setCMISSpecTitle(String cmisSpecTitle) + { + this.cmisSpecTitle = cmisSpecTitle; + } + /** * Sets the default root store * @@ -295,6 +306,15 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware, return cmisVersion; } + /* + * (non-Javadoc) + * @see org.alfresco.cmis.CMISServices#getCMISSpecTitle() + */ + public String getCMISSpecTitle() + { + return cmisSpecTitle; + } + /* * (non-Javadoc) * @see org.alfresco.cmis.CMISServices#getDefaultRootPath()