From 9cafc890c43b5d7e1867808b379a9849cfd678f3 Mon Sep 17 00:00:00 2001 From: David Caruana Date: Fri, 30 Oct 2009 22:34:54 +0000 Subject: [PATCH] Merged CMIS063 to HEAD Resolve merge issues. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17272 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/model/cmisModel.xml | 79 ++++++++----------- .../alfresco/cmis/CMISAllowedActionEnum.java | 6 +- .../org/alfresco/cmis/CMISDataTypeEnum.java | 7 -- .../alfresco/cmis/CMISDictionaryModel.java | 58 +++++++------- .../alfresco/cmis/CMISPropertyDefinition.java | 14 ---- .../CMISBasePropertyDefinition.java | 24 ------ .../alfresco/cmis/mapping/CMISMapping.java | 10 +-- .../cmis/mapping/CMISPropertyServiceTest.java | 4 +- ...athNameProperty.java => PathProperty.java} | 8 +- .../search/CmisFunctionEvaluationContext.java | 1 - 10 files changed, 77 insertions(+), 134 deletions(-) rename source/java/org/alfresco/cmis/mapping/{PathNameProperty.java => PathProperty.java} (94%) diff --git a/config/alfresco/model/cmisModel.xml b/config/alfresco/model/cmisModel.xml index 216d15f841..3b2f07d34a 100644 --- a/config/alfresco/model/cmisModel.xml +++ b/config/alfresco/model/cmisModel.xml @@ -1,7 +1,7 @@ CMIS Model Definitions - 0.62 + 1.0 @@ -15,26 +15,17 @@ - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - + org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser java.lang.String - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - - java.lang.String - - - - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - + org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser java.lang.String - org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser - + org.alfresco.repo.search.impl.lucene.analysis.AlfrescoStandardAnalyser java.lang.String @@ -58,7 +49,7 @@ - + Object Id The unique object id (a node ref) cmis:id @@ -69,7 +60,7 @@ false - + Object Type Id Id of the object’s type cmis:id @@ -80,7 +71,7 @@ false - + Base Type Id Id of the base object type for the object cmis:id @@ -91,7 +82,7 @@ false - + Created by The authority who created this object d:text @@ -102,7 +93,7 @@ false - + Creation Date The object creation date d:datetime @@ -113,7 +104,7 @@ false - + Last Modified By The authority who last modified this object d:text @@ -124,7 +115,7 @@ false - + Last Modified Date The date this object was last modified d:datetime @@ -135,7 +126,7 @@ false - + Change token Change Token d:text @@ -151,7 +142,7 @@ cmis:object - + Name Name d:text @@ -170,7 +161,7 @@ Document Type cmis:filesystemobject - + Is Immutable Is the document immutable? d:boolean @@ -179,7 +170,7 @@ false - + Is Latest Version Is this the latest version of the document? d:boolean @@ -188,7 +179,7 @@ false - + Is Major Version Is this a major version of the document? d:boolean @@ -197,7 +188,7 @@ false - + Is Latest Major Version Is this the latest major version of the document? d:boolean @@ -206,7 +197,7 @@ false - + Version Label The version label d:text @@ -217,7 +208,7 @@ true - + Version series id The version series id cmis:id @@ -228,7 +219,7 @@ false - + Is Version Series Checked Out Is the version series checked out? d:boolean @@ -237,7 +228,7 @@ false - + Version Series Checked Out By The authority who checked out this document version series d:text @@ -246,7 +237,7 @@ false - + Version Series Checked Out Id The checked out version series id cmis:id @@ -255,7 +246,7 @@ false - + Checkin Comment The checkin comment d:text @@ -264,7 +255,7 @@ false - + Content Stream Length The length of the content stream d:int @@ -275,7 +266,7 @@ false - + Content Stream MIME Type The content stream MIME type d:text @@ -286,7 +277,7 @@ false - + Content Stream Filename The content stream filename d:text @@ -297,7 +288,7 @@ true - + Content Stream Id Id of the stream cmis:id @@ -316,7 +307,7 @@ Folder Type cmis:filesystemobject - + Parent Id The parent id of the folder cmis:id @@ -327,9 +318,9 @@ false - - Path Name - Name of the path element for this folder + + Path + The fully qualified path to this folder/description d:text true true @@ -338,7 +329,7 @@ false - + Allowed Child Object Types Ids The allowed child object type ids cmis:id @@ -355,7 +346,7 @@ Relationship Type cmis:object - + Source Id The source id for the relationship cmis:id @@ -364,7 +355,7 @@ false - + Target Id The target id for the relationship cmis:id @@ -381,7 +372,7 @@ Policy Type cmis:object - + Policy Text The policy text d:text diff --git a/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java b/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java index a49705e4b9..b785ed2e26 100644 --- a/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java +++ b/source/java/org/alfresco/cmis/CMISAllowedActionEnum.java @@ -32,7 +32,8 @@ package org.alfresco.cmis; public enum CMISAllowedActionEnum implements EnumLabel { // navigation services - CAN_GET_DESCENDANTS("canGetDescendants"), + CAN_GET_DESCENDANTS("canGetDescendants"), + CAN_GET_FOLDER_TREE("canGetFolderTree"), CAN_GET_CHILDREN("canGetChildren"), CAN_GET_FOLDER_PARENT("canGetFolderParent"), CAN_GET_OBJECT_PARENTS("canGetObjectParents"), @@ -48,7 +49,6 @@ public enum CMISAllowedActionEnum implements EnumLabel CAN_UPDATE_PROPERTIES("canUpdateProperties"), CAN_MOVE_OBJECT("canMoveObject"), CAN_DELETE_OBJECT("canDeleteObject"), - CAN_DELETE_TREE("canDeleteTree"), CAN_SET_CONTENT_STREAM("canSetContentStream"), CAN_DELETE_CONTENT_STREAM("canDeleteContentStream"), @@ -63,7 +63,7 @@ public enum CMISAllowedActionEnum implements EnumLabel CAN_GET_ALL_VERSIONS("canGetAllVersions"), // relationship services - CAN_GET_RELATIONSHIPS("canGetRelationships"), + CAN_GET_OBJECT_RELATIONSHIPS("canGetObjectRelationships"), // policy services CAN_APPLY_POLICY("canApplyPolicy"), diff --git a/source/java/org/alfresco/cmis/CMISDataTypeEnum.java b/source/java/org/alfresco/cmis/CMISDataTypeEnum.java index afae90cfa0..e8d4cb20a9 100644 --- a/source/java/org/alfresco/cmis/CMISDataTypeEnum.java +++ b/source/java/org/alfresco/cmis/CMISDataTypeEnum.java @@ -83,13 +83,6 @@ public enum CMISDataTypeEnum implements EnumLabel return DataTypeDefinition.TEXT; } }, - XML("xml") - { - public QName getDefaultDataType() - { - return DataTypeDefinition.TEXT; - } - }, HTML("html") { public QName getDefaultDataType() diff --git a/source/java/org/alfresco/cmis/CMISDictionaryModel.java b/source/java/org/alfresco/cmis/CMISDictionaryModel.java index 8e62d850e8..264e67c3e9 100644 --- a/source/java/org/alfresco/cmis/CMISDictionaryModel.java +++ b/source/java/org/alfresco/cmis/CMISDictionaryModel.java @@ -41,34 +41,34 @@ public interface CMISDictionaryModel public static CMISTypeId POLICY_TYPE_ID = new CMISTypeId(CMISScope.POLICY, CMISMapping.POLICY_QNAME, CMISMapping.CMIS_MODEL_NS + ":" + CMISMapping.POLICY_QNAME.getLocalName(), CMISMapping.POLICY_QNAME); // CMIS properties - public static String PROP_OBJECT_ID = "cmis:ObjectId"; - public static String PROP_BASE_TYPE_ID = "cmis:BaseTypeId"; - public static String PROP_OBJECT_TYPE_ID = "cmis:ObjectTypeId"; - public static String PROP_CREATED_BY = "cmis:CreatedBy"; - public static String PROP_CREATION_DATE = "cmis:CreationDate"; - public static String PROP_LAST_MODIFIED_BY = "cmis:LastModifiedBy"; - public static String PROP_LAST_MODIFICATION_DATE = "cmis:LastModificationDate"; - public static String PROP_CHANGE_TOKEN = "cmis:ChangeToken"; - public static String PROP_NAME = "cmis:Name"; - public static String PROP_IS_IMMUTABLE = "cmis:IsImmutable"; - public static String PROP_IS_LATEST_VERSION = "cmis:IsLatestVersion"; - public static String PROP_IS_MAJOR_VERSION = "cmis:IsMajorVersion"; - public static String PROP_IS_LATEST_MAJOR_VERSION = "cmis:IsLatestMajorVersion"; - public static String PROP_VERSION_LABEL = "cmis:VersionLabel"; - public static String PROP_VERSION_SERIES_ID = "cmis:VersionSeriesId"; - public static String PROP_IS_VERSION_SERIES_CHECKED_OUT = "cmis:IsVersionSeriesCheckedOut"; - public static String PROP_VERSION_SERIES_CHECKED_OUT_BY = "cmis:VersionSeriesCheckedOutBy"; - public static String PROP_VERSION_SERIES_CHECKED_OUT_ID = "cmis:VersionSeriesCheckedOutId"; - public static String PROP_CHECKIN_COMMENT = "cmis:CheckinComment"; - public static String PROP_CONTENT_STREAM_LENGTH = "cmis:ContentStreamLength"; - public static String PROP_CONTENT_STREAM_MIME_TYPE = "cmis:ContentStreamMimeType"; - public static String PROP_CONTENT_STREAM_FILENAME = "cmis:ContentStreamFileName"; - public static String PROP_CONTENT_STREAM_ID = "cmis:ContentStreamId"; - public static String PROP_PARENT_ID = "cmis:ParentId"; - public static String PROP_PATH_NAME = "cmis:PathName"; - public static String PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS = "cmis:AllowedChildObjectTypeIds"; - public static String PROP_SOURCE_ID = "cmis:SourceId"; - public static String PROP_TARGET_ID = "cmis:TargetId"; - public static String PROP_POLICY_TEXT = "cmis:PolicyText"; + public static String PROP_OBJECT_ID = "cmis:objectId"; + public static String PROP_BASE_TYPE_ID = "cmis:baseTypeId"; + public static String PROP_OBJECT_TYPE_ID = "cmis:objectTypeId"; + public static String PROP_CREATED_BY = "cmis:createdBy"; + public static String PROP_CREATION_DATE = "cmis:creationDate"; + public static String PROP_LAST_MODIFIED_BY = "cmis:lastModifiedBy"; + public static String PROP_LAST_MODIFICATION_DATE = "cmis:lastModificationDate"; + public static String PROP_CHANGE_TOKEN = "cmis:changeToken"; + public static String PROP_NAME = "cmis:name"; + public static String PROP_IS_IMMUTABLE = "cmis:isImmutable"; + public static String PROP_IS_LATEST_VERSION = "cmis:isLatestVersion"; + public static String PROP_IS_MAJOR_VERSION = "cmis:isMajorVersion"; + public static String PROP_IS_LATEST_MAJOR_VERSION = "cmis:isLatestMajorVersion"; + public static String PROP_VERSION_LABEL = "cmis:versionLabel"; + public static String PROP_VERSION_SERIES_ID = "cmis:versionSeriesId"; + public static String PROP_IS_VERSION_SERIES_CHECKED_OUT = "cmis:isVersionSeriesCheckedOut"; + public static String PROP_VERSION_SERIES_CHECKED_OUT_BY = "cmis:versionSeriesCheckedOutBy"; + public static String PROP_VERSION_SERIES_CHECKED_OUT_ID = "cmis:versionSeriesCheckedOutId"; + public static String PROP_CHECKIN_COMMENT = "cmis:checkinComment"; + public static String PROP_CONTENT_STREAM_LENGTH = "cmis:contentStreamLength"; + public static String PROP_CONTENT_STREAM_MIME_TYPE = "cmis:contentStreamMimeType"; + public static String PROP_CONTENT_STREAM_FILENAME = "cmis:contentStreamFileName"; + public static String PROP_CONTENT_STREAM_ID = "cmis:contentStreamId"; + public static String PROP_PARENT_ID = "cmis:parentId"; + public static String PROP_PATH = "cmis:path"; + public static String PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS = "cmis:allowedChildObjectTypeIds"; + public static String PROP_SOURCE_ID = "cmis:sourceId"; + public static String PROP_TARGET_ID = "cmis:targetId"; + public static String PROP_POLICY_TEXT = "cmis:policyText"; } diff --git a/source/java/org/alfresco/cmis/CMISPropertyDefinition.java b/source/java/org/alfresco/cmis/CMISPropertyDefinition.java index 2303e36af8..8ba6a8cac5 100644 --- a/source/java/org/alfresco/cmis/CMISPropertyDefinition.java +++ b/source/java/org/alfresco/cmis/CMISPropertyDefinition.java @@ -138,20 +138,6 @@ public interface CMISPropertyDefinition */ public int getMaximumLength(); - /** - * For properties of type CMISPropertyType.XML the schema to which the property must conform. Unsupported - * - * @return - the schema URI - */ - public String getSchemaURI(); - - /** - * For properties of type CMISPropertyType.XML the encoding used for the property value - * - * @return the encoding - */ - public String getEncoding(); - /** * Gets the property accessor (for reading / writing values) * diff --git a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java b/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java index 373b743ada..e2dd3bc548 100644 --- a/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java +++ b/source/java/org/alfresco/cmis/dictionary/CMISBasePropertyDefinition.java @@ -71,8 +71,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria private CMISDataTypeEnum propertyType; private CMISCardinalityEnum cardinality; private int maximumLength = -1; - private String schemaURI = null; - private String encoding = null; private Collection choices = new HashSet(); private boolean isOpenChoice = false; private boolean required; @@ -239,26 +237,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria return maximumLength; } - /** - * For properties of type CMISPropertyType.XML the schema to which the property must conform. Unsupported - * - * @return - the schema URI - */ - public String getSchemaURI() - { - return schemaURI; - } - - /** - * For properties of type CMISPropertyType.XML the encoding used for the property value - * - * @return the encoding - */ - public String getEncoding() - { - return encoding; - } - /** * Get the choices available as values for this property TODO: not implemented yet * @@ -370,8 +348,6 @@ public class CMISBasePropertyDefinition implements CMISPropertyDefinition, Seria builder.append("PropertyType=").append(getDataType()).append(", "); builder.append("Cardinality=").append(getCardinality()).append(", "); builder.append("MaximumLength=").append(getMaximumLength()).append(", "); - builder.append("SchemaURI=").append(getSchemaURI()).append(", "); - builder.append("Encoding=").append(getEncoding()).append(", "); builder.append("Choices=").append(getChoices()).append(", "); builder.append("IsOpenChoice=").append(isOpenChoice()).append(", "); builder.append("Required=").append(isRequired()).append(", "); diff --git a/source/java/org/alfresco/cmis/mapping/CMISMapping.java b/source/java/org/alfresco/cmis/mapping/CMISMapping.java index f846f14c20..61957d536f 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISMapping.java +++ b/source/java/org/alfresco/cmis/mapping/CMISMapping.java @@ -158,7 +158,6 @@ public class CMISMapping implements InitializingBean mapAlfrescoToCmisDataType.put(DataTypeDefinition.TEXT, CMISDataTypeEnum.STRING); mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_ID, CMISDataTypeEnum.ID); mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_URI, CMISDataTypeEnum.URI); - mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_XML, CMISDataTypeEnum.XML); mapAlfrescoToCmisDataType.put(CMIS_DATATYPE_HTML, CMISDataTypeEnum.HTML); // @@ -189,7 +188,7 @@ public class CMISMapping implements InitializingBean registerPropertyAccessor(new ContentStreamIdProperty(serviceRegistry)); registerPropertyAccessor(new DirectProperty(serviceRegistry, CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME, ContentModel.PROP_NAME)); registerPropertyAccessor(new ParentProperty(serviceRegistry)); - registerPropertyAccessor(new PathNameProperty(serviceRegistry, cmisService)); + registerPropertyAccessor(new PathProperty(serviceRegistry, cmisService)); registerPropertyAccessor(new FixedValueProperty(serviceRegistry, CMISDictionaryModel.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS, null)); registerPropertyAccessor(new SourceIdProperty(serviceRegistry)); registerPropertyAccessor(new TargetIdProperty(serviceRegistry)); @@ -201,7 +200,7 @@ public class CMISMapping implements InitializingBean registerEvaluator(CMISScope.DOCUMENT, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE)); registerEvaluator(CMISScope.DOCUMENT, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES)); registerEvaluator(CMISScope.DOCUMENT, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); - registerEvaluator(CMISScope.DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_RELATIONSHIPS, true)); + registerEvaluator(CMISScope.DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_RELATIONSHIPS, true)); registerEvaluator(CMISScope.DOCUMENT, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_PARENTS, true)); // Is CAN_MOVE correct mapping? registerEvaluator(CMISScope.DOCUMENT, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_MOVE_OBJECT, PermissionService.DELETE_NODE)); @@ -227,7 +226,7 @@ public class CMISMapping implements InitializingBean 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_RELATIONSHIPS, true)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_PARENTS, true)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_FOLDER_PARENT, true)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_DESCENDANTS, PermissionService.READ_CHILDREN)); @@ -241,7 +240,6 @@ public class CMISMapping implements InitializingBean registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_CREATE_FOLDER, PermissionService.CREATE_CHILDREN)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_CREATE_RELATIONSHIP, PermissionService.CREATE_ASSOCIATIONS)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_CREATE_POLICY, false)); - registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_DELETE_TREE, PermissionService.DELETE_NODE)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_ACL, false)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_APPLY_ACL, false)); @@ -258,7 +256,7 @@ public class CMISMapping implements InitializingBean registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_MOVE_OBJECT, false)); registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_ADD_OBJECT_TO_FOLDER, false)); registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_REMOVE_OBJECT_FROM_FOLDER, false)); - registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_RELATIONSHIPS, false)); + registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_RELATIONSHIPS, false)); registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_ACL, false)); registerEvaluator(CMISScope.POLICY, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_APPLY_ACL, false)); } diff --git a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java index 3f7d574527..e23afa6f36 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java +++ b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java @@ -44,7 +44,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest { public void testBasicFolder() { - NodeRef folder = fileFolderService.create(rootNodeRef, "BaseFolder", ContentModel.TYPE_FOLDER).getNodeRef(); + NodeRef folder = fileFolderService.create(cmisService.getDefaultRootNodeRef(), "BaseFolder", ContentModel.TYPE_FOLDER).getNodeRef(); Map properties = cmisService.getProperties(folder); assertEquals(folder.toString(), properties.get(CMISDictionaryModel.PROP_OBJECT_ID)); assertEquals(CMISDictionaryModel.FOLDER_TYPE_ID.getId(), properties.get(CMISDictionaryModel.PROP_OBJECT_TYPE_ID)); @@ -72,7 +72,7 @@ public class CMISPropertyServiceTest extends BaseCMISTest assertNull(properties.get(CMISDictionaryModel.PROP_CONTENT_STREAM_FILENAME)); assertNull(properties.get(CMISDictionaryModel.PROP_CONTENT_STREAM_ID)); - assertEquals(rootNodeRef.toString(), properties.get(CMISDictionaryModel.PROP_PARENT_ID)); + assertEquals(cmisService.getDefaultRootNodeRef().toString(), properties.get(CMISDictionaryModel.PROP_PARENT_ID)); assertNull(properties.get(CMISDictionaryModel.PROP_ALLOWED_CHILD_OBJECT_TYPE_IDS)); } diff --git a/source/java/org/alfresco/cmis/mapping/PathNameProperty.java b/source/java/org/alfresco/cmis/mapping/PathProperty.java similarity index 94% rename from source/java/org/alfresco/cmis/mapping/PathNameProperty.java rename to source/java/org/alfresco/cmis/mapping/PathProperty.java index 963dcfe7e1..f3ccda4feb 100644 --- a/source/java/org/alfresco/cmis/mapping/PathNameProperty.java +++ b/source/java/org/alfresco/cmis/mapping/PathProperty.java @@ -37,11 +37,11 @@ import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path.ChildAssocElement; /** - * Get the CMIS object id property. + * Get the CMIS path property. * * @author davidc */ -public class PathNameProperty extends AbstractProperty +public class PathProperty extends AbstractProperty { private CMISServices cmisService; @@ -50,9 +50,9 @@ public class PathNameProperty extends AbstractProperty * * @param serviceRegistry */ - public PathNameProperty(ServiceRegistry serviceRegistry, CMISServices cmisService) + public PathProperty(ServiceRegistry serviceRegistry, CMISServices cmisService) { - super(serviceRegistry, CMISDictionaryModel.PROP_PATH_NAME); + super(serviceRegistry, CMISDictionaryModel.PROP_PATH); this.cmisService = cmisService; } diff --git a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java index 0c2a5d633b..593bc8f126 100644 --- a/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java +++ b/source/java/org/alfresco/cmis/search/CmisFunctionEvaluationContext.java @@ -31,7 +31,6 @@ import java.util.Map; import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryService; import org.alfresco.cmis.CMISPropertyDefinition; -import org.alfresco.cmis.mapping.CMISMapping; import org.alfresco.repo.search.impl.lucene.LuceneFunction; import org.alfresco.repo.search.impl.lucene.LuceneQueryParser; import org.alfresco.repo.search.impl.querymodel.FunctionArgument;