diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.atom.ftl index 372bb93e2e..7914e7383b 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.atom.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.atom.ftl @@ -40,13 +40,13 @@ [/#macro] [#macro documentCMISLinks node] - - - - -[@linkstream node "cmis-stream"/] - - + + + + +[@linkstream node "stream"/] + + [/#macro] [#macro documentCMISProps node propfilter] @@ -156,16 +156,15 @@ [/#macro] [#macro folderCMISLinks node] - - + + [#if cmisproperty(node, "ParentId")??] - - + [/#if] - - - - + + + + [/#macro] [#macro folderCMISProps node propfilter] @@ -342,23 +341,23 @@ [/#macro] [#macro typedefCMISLinks typedef] - + [#if typedef.parentType??] - + [/#if] - - - + + + [/#macro] [#macro typedefCMISProps typedef includeProperties=true includeInheritedProperties=true] -[#if typedef.rootType.typeId.id = "document"] +[#if typedef.baseType.typeId.id = "document"] [@documenttypedefCMISProps typedef includeProperties includeInheritedProperties/] -[#elseif typedef.rootType.typeId.id = "folder"] +[#elseif typedef.baseType.typeId.id = "folder"] [@foldertypedefCMISProps typedef includeProperties includeInheritedProperties/] -[#elseif typedef.rootType.typeId.id = "relationship"] +[#elseif typedef.baseType.typeId.id = "relationship"] [@relationshiptypedefCMISProps typedef includeProperties includeInheritedProperties/] -[#elseif typedef.rootType.typeId.id = "policy"] +[#elseif typedef.baseType.typeId.id = "policy"] [@policytypedefCMISProps typedef includeProperties includeInheritedProperties/] [/#if] [/#macro] @@ -394,8 +393,8 @@ ${typedef.typeId.id} ${typedef.queryName} [#if typedef.displayName??]${typedef.displayName?xml}[/#if] - ${typedef.rootType.typeId.id} [#-- TODO: remove spec issue 36 --] - ${typedef.rootType.queryName} + ${typedef.baseType.typeId.id} [#-- TODO: remove spec issue 36 --] + ${typedef.baseType.queryName} [#if typedef.parentType??] ${typedef.parentType.typeId.id} [/#if] @@ -500,6 +499,8 @@ [#macro abstractpropdefCMISProps propdef inherited=false] ${propdef.propertyId.name} ${propdef.propertyId} + [#-- TODO: CMIS spec issue: wait for definition of this --] + TODO [#if propdef.displayName??]${propdef.displayName?xml}[/#if] [#if propdef.description??] ${propdef.description?xml} diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.js b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.js index c102f1c0c0..2b0ecb7eaf 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomentry.lib.js @@ -25,7 +25,7 @@ function createNode(parent, entry, slug) // construct node of folder or file var name = (slug !== null) ? slug : entry.title; - var baseType = type.typeId.rootTypeId.id; + var baseType = type.typeId.baseTypeId.id; if (baseType == "document") { node = parent.createFile(name); diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomfeed.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomfeed.lib.atom.ftl index 9f37bbec8f..0079d3c680 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/atomfeed.lib.atom.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/atomfeed.lib.atom.ftl @@ -37,7 +37,7 @@ ${absurl(url.context)}/images/logo/AlfrescoLogo16.ico urn:uuid:${node.id}[#if title != ""]-${title}[/#if] - + [#nested] [#-- NOTE: Custom links --] ${node.name}[#if title != ""] ${title?capitalize}[/#if] ${xmldate(node.properties.modified)} diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/entries.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/entries.lib.atom.ftl deleted file mode 100644 index 049e838721..0000000000 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/entries.lib.atom.ftl +++ /dev/null @@ -1,81 +0,0 @@ -<#macro document node> -<#-- ATOM props --> -${node.name} -urn:uuid:${node.id} -${xmldate(node.properties.modified)} -${xmldate(node.properties.created)} -${node.properties.description!""} -${node.properties.creator} -<#-- Alfresco props --> -${node.nodeRef} -${absurl(url.context)}${node.icon16} -<#-- CMIS Schema --> - - ${node.id} - document - http://example.org/atom03 <#-- TODO: --> - document <#-- TODO: --> - Al Brown <#-- TODO: --> - 2003-12-13T18:30:02Z <#-- TODO: --> - Al Brown <#-- TODO: --> - 2003-12-13T18:30:02Z <#-- TODO: --> - true <#-- TODO: --> - false <#-- TODO: --> - 534 <#-- TODO: --> - application/msword <#-- TODO: --> - myDocument.doc <#-- TODO: --> - http://example.org/media/atom03 <#-- TODO: --> - XML <#-- TODO: --> - standards <#-- TODO: --> - -<#-- TODO: ATOM LINKS --> - <#-- TODO: --> - - -<#-- CMIS LINKS --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - - -<#macro folder node> -<#-- ATOM props --> -${node.name} -urn:uuid:${node.id} -${xmldate(node.properties.modified)} -${xmldate(node.properties.created)} -${node.properties.description!""} -${node.properties.creator!""} -<#-- Alfresco props --> -${node.nodeRef} -${absurl(url.context)}${node.icon16} -<#-- CMIS Schema --> - - ${node.id} - folder - http://example.org/folders/myfolder <#-- TODO: --> - folder <#-- TODO: --> - folder <#-- TODO: --> - Al Brown <#-- TODO: --> - 2003-12-13T18:30:02Z <#-- TODO: --> - Al Brown <#-- TODO: --> - 2003-12-13T18:30:02Z <#-- TODO: --> - Atom-powered folders <#-- TODO: --> - folderIdp1 <#-- TODO: --> - <#-- In certain cases, if depth is specified children may appear Here. If there are children, the cmis:object tag will be nested For the children of this item --> - -<#-- TODO: ATOM LINKS --> - - - -<#-- CMIS LINKS --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - <#-- TODO: --> - \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/cmis/ns.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/cmis/ns.lib.atom.ftl index 22bfbbaa32..60bbcb8253 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/cmis/ns.lib.atom.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/cmis/ns.lib.atom.ftl @@ -1,7 +1,7 @@ [#ftl] [#macro appNS]http://www.w3.org/2007/app[/#macro] [#macro atomNS]http://www.w3.org/2005/Atom[/#macro] -[#macro cmisNS]http://www.cmis.org/2008/05[/#macro] +[#macro cmisNS]http://docs.oasis-open.org/ns/cmis/core/200901[/#macro] [#macro alfNS]http://www.alfresco.org[/#macro] [#macro opensearchNS]http://a9.com/-/spec/opensearch/1.1/[/#macro] [#macro serviceNS]xmlns="[@appNS/]" xmlns:atom="[@atomNS/]" xmlns:cmis="[@cmisNS/]" xmlns:alf="[@alfNS/]"[/#macro] diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.atom.ftl index 52a708e4f4..c070ef179c 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.atom.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.atom.ftl @@ -9,7 +9,7 @@ ${server.id} ${server.name} self - [#-- TODO --] + [#-- TODO --] Alfresco Alfresco Repository (${server.edition}) ${server.version} @@ -23,34 +23,38 @@ ${allVersionsSearchable?string} ${querySupport} ${joinSupport} - ${fullTextSupport} + [#-- TODO: wait for unified search proposal before implementing --] + none + false + [#-- TODO: --] - ${cmisVersion} + ${cmisVersion} - + root collection - + root collection checkedout collection + application/atom+xml;type=entry unfiled collection + application/atom+xml;type=entry - + type collection - [#-- TODO: wait for 0.5 spec --] - + type collection - [#-- TODO: --] query collection + application/cmisquery+xml diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.js index 588be8af13..ebd41ee2d8 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/repository.get.js @@ -5,6 +5,5 @@ model.defaultRootFolder = cmis.defaultRootFolder; model.defaultRootFolderPath = cmis.defaultRootFolderPath; model.querySupport = cmis.querySupport.label; model.joinSupport = cmis.joinSupport.label; -model.fullTextSupport = cmis.fullTextSearchSupport.label; model.pwcSearchable = cmis.pwcSearchable; model.allVersionsSearchable = cmis.allVersionsSearchable; diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmisquery.js b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmisquery.js index ef5fd76454..470e73cb0e 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmisquery.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmisquery.js @@ -2,7 +2,7 @@ script: { // process query statement // - // + // // SELECT name FROM DOCUMENT_OBJECT_TYPE // false // 0 @@ -16,7 +16,7 @@ script: return str.replace(/^\s+/, ''); } - default xml namespace = 'http://www.cmis.org/2008/05'; + default xml namespace = 'http://docs.oasis-open.org/ns/cmis/core/200901'; // regex to match an XML declaration var xmlDeclaration = /^<\?xml version[^>]+?>/; diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.atomentry.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.cmisallowableactions.ftl similarity index 100% rename from config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.atomentry.ftl rename to config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.cmisallowableactions.ftl diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.desc.xml index 867a74c0a5..12a2fd6469 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/allowableactions.get.desc.xml @@ -4,6 +4,6 @@ /api/node/{store_type}/{store_id}/{id}/permissions /api/path/{store_type}/{store_id}/{id}/permissions guest - argument + argument CMIS \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java index d6ab0ce324..e1ab1edba1 100644 --- a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java +++ b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java @@ -28,7 +28,6 @@ import java.util.Collection; import java.util.Iterator; import org.alfresco.cmis.CMISDictionaryService; -import org.alfresco.cmis.CMISFullTextSearchEnum; import org.alfresco.cmis.CMISJoinEnum; import org.alfresco.cmis.CMISPropertyDefinition; import org.alfresco.cmis.CMISQueryEnum; @@ -461,16 +460,6 @@ public class CMISScript extends BaseScopableProcessorExtension return cmisQueryService.getJoinSupport(); } - /** - * Get the full text search support level in queries. - * - * @return - */ - public CMISFullTextSearchEnum getFullTextSearchSupport() - { - return cmisQueryService.getFullTextSearchSupport(); - } - /** * Issue query * diff --git a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java b/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java index 7ebbd33b1f..2af505cdfd 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java +++ b/source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java @@ -91,7 +91,7 @@ public class BaseCMISWebScriptTest extends BaseWebScriptTest // cached responses private AbderaService abdera; private Service service = null; - private String fullTextCapability = null; + private String queryCapability = null; private Entry testRootFolder = null; private Entry testRunFolder = null; @@ -433,21 +433,21 @@ public class BaseCMISWebScriptTest extends BaseWebScriptTest return service; } - protected String getFullTextCapability() + protected String getQueryCapability() throws Exception { - if (fullTextCapability == null) + if (queryCapability == null) { Service repo = getRepository(); - Workspace workspace = getWorkspace(service); + Workspace workspace = getWorkspace(repo); CMISRepositoryInfo repoInfo = workspace.getExtension(CMISConstants.REPOSITORY_INFO); assertNotNull(repoInfo); CMISCapabilities capabilities = repoInfo.getCapabilities(); assertNotNull(repoInfo); - fullTextCapability = capabilities.getFullText(); - assertNotNull(fullTextCapability); + queryCapability = capabilities.getJoin(); + assertNotNull(queryCapability); } - return fullTextCapability; + return queryCapability; } protected Workspace getWorkspace(Service service) diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java index 80ef1a003b..d0112742d9 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java +++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java @@ -408,7 +408,7 @@ public class CMISTest extends BaseCMISWebScriptTest assertNotNull(childrenLink); Entry childFolder = createFolder(childrenLink.getHref(), "testParentChild"); assertNotNull(childFolder); - Link parentLink = childFolder.getLink(CMISConstants.REL_FOLDERPARENT); + Link parentLink = childFolder.getLink(CMISConstants.REL_PARENT); assertNotNull(parentLink); // ensure there is parent 'testParent' @@ -1090,6 +1090,12 @@ public class CMISTest extends BaseCMISWebScriptTest public void testQuery() throws Exception { + String queryCapability = getQueryCapability(); + if (queryCapability.equals("none")) + { + return; + } + // retrieve query collection IRI queryHREF = getQueryCollection(getWorkspace(getRepository())); @@ -1114,60 +1120,59 @@ public class CMISTest extends BaseCMISWebScriptTest // retrieve query request document String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml"); + if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate")) { - // construct structured query - String query = "SELECT * FROM Folder " + - "WHERE ObjectId = '" + testFolderObject.getObjectId().getValue() + "'"; - String queryReq = queryDoc.replace("${STATEMENT}", query); - queryReq = queryReq.replace("${SKIPCOUNT}", "0"); - queryReq = queryReq.replace("${PAGESIZE}", "5"); + { + // meta data only query against folder + String query = "SELECT * FROM Folder " + + "WHERE ObjectId = '" + testFolderObject.getObjectId().getValue() + "'"; + String queryReq = queryDoc.replace("${STATEMENT}", query); + queryReq = queryReq.replace("${SKIPCOUNT}", "0"); + queryReq = queryReq.replace("${PAGESIZE}", "5"); + + Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); + assertNotNull(queryRes); + Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); + assertNotNull(queryFeed); + assertEquals(1, queryFeed.getEntries().size()); + assertNotNull(queryFeed.getEntry(testFolder.getId().toString())); + CMISObject result1 = queryFeed.getEntry(testFolder.getId().toString()).getExtension(CMISConstants.OBJECT); + assertEquals(testFolderObject.getName().getValue(), result1.getName().getValue()); + assertEquals(testFolderObject.getObjectId().getValue(), result1.getObjectId().getValue()); + assertEquals(testFolderObject.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue()); + } - // issue structured query - Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); - assertNotNull(queryRes); - Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); - assertNotNull(queryFeed); - assertEquals(1, queryFeed.getEntries().size()); - assertNotNull(queryFeed.getEntry(testFolder.getId().toString())); - CMISObject result1 = queryFeed.getEntry(testFolder.getId().toString()).getExtension(CMISConstants.OBJECT); - assertEquals(testFolderObject.getName().getValue(), result1.getName().getValue()); - assertEquals(testFolderObject.getObjectId().getValue(), result1.getObjectId().getValue()); - assertEquals(testFolderObject.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue()); + { + // meta data only query against document + String query = "SELECT * FROM Document " + + "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getValue() + "') " + + "AND Name = 'apple1'"; + String queryReq = queryDoc.replace("${STATEMENT}", query); + queryReq = queryReq.replace("${SKIPCOUNT}", "0"); + queryReq = queryReq.replace("${PAGESIZE}", "5"); + + Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); + assertNotNull(queryRes); + Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); + assertNotNull(queryFeed); + assertEquals(1, queryFeed.getEntries().size()); + assertNotNull(queryFeed.getEntry(document1.getId().toString())); + CMISObject result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.OBJECT); + assertEquals(document1Object.getName().getValue(), result1.getName().getValue()); + assertEquals(document1Object.getObjectId().getValue(), result1.getObjectId().getValue()); + assertEquals(document1Object.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue()); + } } - + + if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate")) { - // construct structured query - String query = "SELECT * FROM Document " + - "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getValue() + "') " + - "AND Name = 'apple1'"; - String queryReq = queryDoc.replace("${STATEMENT}", query); - queryReq = queryReq.replace("${SKIPCOUNT}", "0"); - queryReq = queryReq.replace("${PAGESIZE}", "5"); - - // issue structured query - Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); - assertNotNull(queryRes); - Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); - assertNotNull(queryFeed); - assertEquals(1, queryFeed.getEntries().size()); - assertNotNull(queryFeed.getEntry(document1.getId().toString())); - CMISObject result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.OBJECT); - assertEquals(document1Object.getName().getValue(), result1.getName().getValue()); - assertEquals(document1Object.getObjectId().getValue(), result1.getObjectId().getValue()); - assertEquals(document1Object.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue()); - } - - String fullTextCapability = getFullTextCapability(); - if (fullTextCapability.equals("fulltextonly") || fullTextCapability.equals("fulltextandstructured")) - { - // construct fulltext query + // full text only query String query = "SELECT ObjectId, ObjectTypeId, Name FROM Document " + "WHERE CONTAINS('" + doc2name + "')"; String queryReq = queryDoc.replace("${STATEMENT}", query); queryReq = queryReq.replace("${SKIPCOUNT}", "0"); queryReq = queryReq.replace("${PAGESIZE}", "5"); - // issue fulltext query Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); assertNotNull(queryRes); Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); @@ -1180,9 +1185,9 @@ public class CMISTest extends BaseCMISWebScriptTest assertEquals(document2Object.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue()); } - if (fullTextCapability.equals("fulltextandstructured")) + if (queryCapability.equals("bothcombined")) { - // construct fulltext and structured query + // combined meta data and full text String query = "SELECT ObjectId, ObjectTypeId, Name FROM Document " + "WHERE IN_FOLDER('" + testFolderObject.getObjectId().getValue() + "') " + "AND Name = 'apple1' " + @@ -1191,7 +1196,6 @@ public class CMISTest extends BaseCMISWebScriptTest queryReq = queryReq.replace("${SKIPCOUNT}", "0"); queryReq = queryReq.replace("${PAGESIZE}", "5"); - // issue structured query Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200); assertNotNull(queryRes); Feed queryFeed = getAbdera().parseFeed(new StringReader(queryRes.getContentAsString()), null); @@ -1207,6 +1211,12 @@ public class CMISTest extends BaseCMISWebScriptTest public void testQueryPaging() throws Exception { + String queryCapability = getQueryCapability(); + if (queryCapability.equals("none")) + { + return; + } + // retrieve query collection IRI queryHREF = getQueryCollection(getWorkspace(getRepository())); @@ -1252,6 +1262,12 @@ public class CMISTest extends BaseCMISWebScriptTest public void testQueryAllowableActions() throws Exception { + String queryCapability = getQueryCapability(); + if (queryCapability.equals("none")) + { + return; + } + // retrieve query collection IRI queryHREF = getQueryCollection(getWorkspace(getRepository())); diff --git a/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml index 86717bfa99..033588b8c3 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/checkinandupdatedocument.atomentry.xml @@ -1,5 +1,5 @@ - + Updated Title ${NAME} updated content ${NAME} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml index a3ddc440ce..2086450c06 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/checkindocument.atomentry.xml @@ -1,2 +1,2 @@ - + diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml index 2c3d2d9a42..9759ed46de 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createcustomdocument.atomentry.xml @@ -1,5 +1,5 @@ - + ${NAME} ${NAME} (summary) ${CONTENT} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml index e362f5d9f6..027407a194 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createcustomfolder.atomentry.xml @@ -1,5 +1,5 @@ - + ${NAME} ${NAME} (summary) diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml index da9c906e91..4d416d12d3 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createdocument.atomentry.xml @@ -1,5 +1,5 @@ - + ${NAME} ${NAME} (summary) ${CONTENT} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml index 4871aea91d..d7b9e810ea 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createdocument2.atomentry.xml @@ -1,4 +1,4 @@ - + onesentence.txt MQ== diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml index 3f76b65cb5..525f3042fc 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createdocumentBase64.atomentry.xml @@ -1,5 +1,5 @@ - + ${NAME} ${NAME} (summary) diff --git a/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml index d01f6b0cf0..7a2dda39e3 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/createfolder.atomentry.xml @@ -1,5 +1,5 @@ - + ${NAME} ${NAME} (summary) diff --git a/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml b/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml index 5c8d4fa779..4ac838b735 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml @@ -1,4 +1,4 @@ - + ${SKIPCOUNT} ${PAGESIZE} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml b/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml index e5c9abd4c5..300b90bf61 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/queryallowableactions.cmisquery.xml @@ -1,4 +1,4 @@ - + ${INCLUDEALLOWABLEACTIONS} ${SKIPCOUNT} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/updateatomentry.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/updateatomentry.atomentry.xml index ec1cae82eb..af0fc340c3 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/updateatomentry.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/updateatomentry.atomentry.xml @@ -1,5 +1,5 @@ - + admin sdsds urn:uuid:87067d6a-e471-4b21-83bd-125e44dc9d75 diff --git a/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml index 2f2ef77e7c..3cca885f54 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/updatecustomdocument.atomentry.xml @@ -1,5 +1,5 @@ - + Updated Title ${NAME} diff --git a/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml b/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml index 86717bfa99..033588b8c3 100644 --- a/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml +++ b/source/java/org/alfresco/repo/cmis/rest/test/updatedocument.atomentry.xml @@ -1,5 +1,5 @@ - + Updated Title ${NAME} updated content ${NAME} diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/APP.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/APP.xsd index 76da25bf40..f86a5bc6ec 100644 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/APP.xsd +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/APP.xsd @@ -6,12 +6,12 @@ + xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" + version="0.52"> - + schemaLocation="ATOM.xsd" /> + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM4CMIS.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd old mode 100644 new mode 100755 similarity index 95% rename from source/java/org/alfresco/repo/cmis/rest/xsd/ATOM4CMIS.xsd rename to source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd index 9110bad98e..f7d32a5749 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM4CMIS.xsd +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/ATOM.xsd @@ -6,14 +6,13 @@ - - + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS.xsd b/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd old mode 100644 new mode 100755 similarity index 84% rename from source/java/org/alfresco/repo/cmis/rest/xsd/CMIS.xsd rename to source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd index 824ba10b55..c66eb92844 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS.xsd +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/CMIS-Core.xsd @@ -1,13 +1,13 @@ + xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" version="0.52"> @@ -53,13 +53,14 @@ - - + + - - + + + @@ -75,7 +76,8 @@ - + + @@ -85,13 +87,6 @@ - - - - - - - @@ -146,23 +141,27 @@ - + + + + + @@ -171,7 +170,7 @@ - + @@ -185,12 +184,13 @@ - + + @@ -204,9 +204,11 @@ + + @@ -218,9 +220,11 @@ + + @@ -229,17 +233,20 @@ - + + + + @@ -266,12 +273,16 @@ + + + + - - - + + + - + - + @@ -303,6 +314,11 @@ maxOccurs="1" /> + + + + + - + - + - + - + @@ -378,7 +397,7 @@ - + @@ -400,21 +419,19 @@ substitutionGroup="cmis:property" nillable="true" /> - + - - + - @@ -422,10 +439,9 @@ - + - @@ -434,10 +450,9 @@ - + - @@ -445,10 +460,9 @@ - + - @@ -456,10 +470,9 @@ - + - @@ -467,11 +480,15 @@ - + + + + + + + - @@ -479,10 +496,9 @@ - + - @@ -490,10 +506,9 @@ - + - @@ -501,17 +516,21 @@ - + + + + + + + - - + @@ -525,9 +544,9 @@ - - - + + + - - + + - - - + + + @@ -618,7 +637,7 @@ substitutionGroup="cmis:choice" /> - + @@ -628,13 +647,14 @@ - + - + @@ -643,7 +663,8 @@ - + @@ -652,7 +673,8 @@ - + @@ -661,7 +683,8 @@ - + @@ -670,7 +693,8 @@ - + @@ -679,8 +703,14 @@ - + + + + + + + @@ -689,7 +719,8 @@ - + @@ -698,7 +729,8 @@ - + @@ -713,9 +745,9 @@ - - - + + + @@ -741,6 +773,8 @@ maxOccurs="1" /> + - + @@ -781,15 +815,15 @@ - + - - + + @@ -892,8 +926,8 @@ - - + + - + - - + + @@ -996,11 +1031,13 @@ - - - + + + + - + + + - - + + @@ -1039,7 +1078,7 @@ - @@ -1066,12 +1105,49 @@ minOccurs="1" maxOccurs="1" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java index c42fdbed68..9b2e3e8708 100644 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISSchemaTest.java @@ -125,85 +125,103 @@ public class CMISSchemaTest extends TestCase public void testAllowableActions() throws Exception { - String xml = getXML("Example-AllowableActions.xml"); + String xml = getXML("Ex-AllowableActions.xml"); + assertValidXML(xml, cmisValidator.getCMISAtomValidator()); + } + + public void testChangeLog() + throws Exception + { + String xml = getXML("Ex-ChangeLog.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testDocumentEntry() throws Exception { - String xml = getXML("Example-DocumentEntry.xml"); + String xml = getXML("Ex-DocumentEntry.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } - public void testDocumentPWCEntry() + public void testDocumentEntryPWC() throws Exception { - String xml = getXML("Example-DocumentPWCEntry.xml"); + String xml = getXML("Ex-DocumentEntryPWC.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } + public void testDocumentEntryWithChanges() + throws Exception + { + String xml = getXML("Ex-DocumentEntryWithChanges.xml"); + assertValidXML(xml, cmisValidator.getCMISAtomValidator()); + } + public void testFolderChildren() throws Exception { - String xml = getXML("Example-FolderChildren.xml"); - assertValidXML(xml, cmisValidator.getCMISAtomValidator()); - } - - public void testFolderChildrenAlfresco() - throws Exception - { - String xml = getXML("Example-FolderChildren-Alfresco.xml"); - assertValidXML(xml, cmisValidator.getCMISAtomValidator()); - } - - public void testFolderDescendants() - throws Exception - { - String xml = getXML("Example-FolderDescendants.xml"); + String xml = getXML("Ex-FolderChildren.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testFolderEntry() throws Exception { - String xml = getXML("Example-FolderEntry.xml"); + String xml = getXML("Ex-FolderEntry.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testPolicyEntry() throws Exception { - String xml = getXML("Example-PolicyEntry.xml"); + String xml = getXML("Ex-PolicyEntry.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testQuery() throws Exception { - String xml = getXML("Example-Query.xml"); + String xml = getXML("Ex-Query.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testRelationshipEntry() throws Exception { - String xml = getXML("Example-RelationshipEntry.xml"); + String xml = getXML("Ex-RelationshipEntry.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } public void testService() throws Exception { - String xml = getXML("Example-Service.xml"); + String xml = getXML("Ex-Service.xml"); assertValidXML(xml, cmisValidator.getAppValidator()); } - public void testType() + public void testFolderChildrenAlfresco() throws Exception { - String xml = getXML("Example-Type.xml"); + String xml = getXML("example_folderchildren_alfresco.xml"); assertValidXML(xml, cmisValidator.getCMISAtomValidator()); } + // + // Missing from v0.6 + // + +// public void testType() +// throws Exception +// { +// String xml = getXML("Example-Type.xml"); +// assertValidXML(xml, cmisValidator.getCMISAtomValidator()); +// } +// +// public void testFolderDescendants() +// throws Exception +// { +// String xml = getXML("Example-FolderDescendants.xml"); +// assertValidXML(xml, cmisValidator.getCMISAtomValidator()); +// } + } diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java index 913f63531e..e984b79fdf 100644 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/CMISValidator.java @@ -110,8 +110,8 @@ public class CMISValidator if (atomValidator == null) { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - Source ATOM4CMISFile = new StreamSource(getClass().getResourceAsStream("ATOM4CMIS.xsd"), getClass().getResource("ATOM4CMIS.xsd").toExternalForm()); - Schema schema = factory.newSchema(ATOM4CMISFile); + Source ATOMFile = new StreamSource(getClass().getResourceAsStream("ATOM.xsd"), getClass().getResource("ATOM.xsd").toExternalForm()); + Schema schema = factory.newSchema(ATOMFile); atomValidator = schema.newValidator(); } diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-AllowableActions.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-AllowableActions.xml new file mode 100755 index 0000000000..e12eba6462 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-AllowableActions.xml @@ -0,0 +1,25 @@ + + + object_id_1 + http://foo/objectid1/allowableactions + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-ChangeLog.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-ChangeLog.xml new file mode 100755 index 0000000000..cf0a102532 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-ChangeLog.xml @@ -0,0 +1,333 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + urn:uuid:62836d48-0da9-4980-af57-91a0f1f22a78 + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntry.xml new file mode 100755 index 0000000000..ab41c8e37c --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntry.xml @@ -0,0 +1,112 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:e3d5f10e-f456-4cac-b44f-864049bc0643 + + + + + + + + + + + + 2009-04-03T13:49:45.453-07:00 + HTML summary of Entry e3d5f10e-f456-4cac-b44f-864049bc0643 + CMIS Example Document + 2009-04-03T13:49:45.468-07:00 + + + + false + + + 2009-04-03T13:49:45.484-07:00 + + + 2009-04-03T13:49:45.484-07:00 + + + e3d5f10e-f456-4cac-b44f-864049bc0643 + + + invoice + + + document + + + Al Brown + + + Al Brown + + + true + + + false + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryPWC.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryPWC.xml new file mode 100755 index 0000000000..967678ba5d --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryPWC.xml @@ -0,0 +1,119 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:3fdb2955-ef3b-47e6-930e-869d6d0067b8 + + + + + + + + + + + + + 2009-04-03T13:49:46.390-07:00 + HTML summary of Entry 3fdb2955-ef3b-47e6-930e-869d6d0067b8 + CMIS Example Document for PWC + 2009-04-03T13:49:46.406-07:00 + + + + false + + + 2009-04-03T13:49:46.406-07:00 + + + 2009-04-03T13:49:46.406-07:00 + + + 3fdb2955-ef3b-47e6-930e-869d6d0067b8 + + + invoice + + + document + + + Al Brown + + + Al Brown + + + true + + + true + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + vs-3fdb2955-ef3b-47e6-930e-869d6d0067b8 + + + Al Brown + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryWithChanges.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryWithChanges.xml new file mode 100755 index 0000000000..d7e03cf3eb --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-DocumentEntryWithChanges.xml @@ -0,0 +1,112 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:c82f3579-5e5d-4ce3-b53c-846376f04e39 + + + + + + + + + + + + 2009-04-03T13:49:53.296-07:00 + HTML summary of Entry c82f3579-5e5d-4ce3-b53c-846376f04e39 + CMIS Example Document - Loan + 2009-04-03T13:49:53.296-07:00 + + + + false + + + 2009-04-03T13:49:53.296-07:00 + + + 2009-04-03T13:49:53.296-07:00 + + + c82f3579-5e5d-4ce3-b53c-846376f04e39 + + + loan + + + document + + + Al Brown + + + Al Brown + + + true + + + false + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderChildren.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderChildren.xml new file mode 100755 index 0000000000..718450c1dd --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderChildren.xml @@ -0,0 +1,483 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + urn:uuid:782f2f72-7c87-466e-aab7-b2564c254719 + + + Feed for folder1 + 2009-04-03T13:49:50.765-07:00 + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:a47f3dd1-3721-4db9-ae1e-df54b09283bb + + + + + + + 2009-04-03T13:49:50.765-07:00 + HTML summary of Entry a47f3dd1-3721-4db9-ae1e-df54b09283bb + CMIS Example Folder as Customer type + 2009-04-03T13:49:50.781-07:00 + + + + false + + + 2009-04-03T13:49:50.781-07:00 + + + 2009-04-03T13:49:50.781-07:00 + + + a47f3dd1-3721-4db9-ae1e-df54b09283bb + + + customer + + + folder + + + Al Brown + + + Al Brown + + + a47f3dd1-3721-4db9-ae1e-df54b09283bbparent + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:a51359a1-29d2-4a2b-9d3c-490136318393 + + + + + + + + + + + + 2009-04-03T13:49:50.781-07:00 + HTML summary of Entry a51359a1-29d2-4a2b-9d3c-490136318393 + CMIS Example Doc as Invoice type + 2009-04-03T13:49:50.781-07:00 + + + + false + + + 2009-04-03T13:49:50.781-07:00 + + + 2009-04-03T13:49:50.781-07:00 + + + a51359a1-29d2-4a2b-9d3c-490136318393 + + + invoice + + + document + + + Al Brown + + + Al Brown + + + true + + + false + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:773cd9e1-09af-4ed4-af82-abbf62855aab + + + + + + + + + + + + 2009-04-03T13:49:50.781-07:00 + HTML summary of Entry 773cd9e1-09af-4ed4-af82-abbf62855aab + CMIS Example Doc as Invoice type + 2009-04-03T13:49:50.781-07:00 + + + + false + + + 2009-04-03T13:49:50.781-07:00 + + + 2009-04-03T13:49:50.781-07:00 + + + 773cd9e1-09af-4ed4-af82-abbf62855aab + + + invoice + + + document + + + Al Brown + + + Al Brown + + + true + + + false + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:eb8ba6f5-00dc-4938-aed5-820de7be6e77 + + + + + + + 2009-04-03T13:49:50.781-07:00 + HTML summary of Entry eb8ba6f5-00dc-4938-aed5-820de7be6e77 + CMIS Example Folder as Customer type + 2009-04-03T13:49:50.781-07:00 + + + + false + + + 2009-04-03T13:49:50.796-07:00 + + + 2009-04-03T13:49:50.796-07:00 + + + eb8ba6f5-00dc-4938-aed5-820de7be6e77 + + + customer + + + folder + + + Al Brown + + + Al Brown + + + eb8ba6f5-00dc-4938-aed5-820de7be6e77parent + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:f0ba7610-ed2c-4cab-883e-10f18d205216 + + + + + + + + + + + + 2009-04-03T13:49:50.796-07:00 + HTML summary of Entry f0ba7610-ed2c-4cab-883e-10f18d205216 + CMIS Example Doc as Invoice type + 2009-04-03T13:49:50.796-07:00 + + + + false + + + 2009-04-03T13:49:50.796-07:00 + + + 2009-04-03T13:49:50.796-07:00 + + + f0ba7610-ed2c-4cab-883e-10f18d205216 + + + invoice + + + document + + + Al Brown + + + Al Brown + + + true + + + false + + + false + + + false + + + Checkin comment + + + 0.1 + + + text/plain + + + text.txt + + + http://cmis-server.foo/document-entry/media + + + 4234 + + + document + example + sample + cmis + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + + false + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderEntry.xml new file mode 100755 index 0000000000..9fa20ff5c7 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-FolderEntry.xml @@ -0,0 +1,69 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:9a00d022-5a20-47f0-b41f-6f82957d151d + + + + + + + 2009-04-03T13:49:47.437-07:00 + HTML summary of Entry 9a00d022-5a20-47f0-b41f-6f82957d151d + CMIS Example Folder as Customer type + 2009-04-03T13:49:47.437-07:00 + + + + false + + + 2009-04-03T13:49:47.437-07:00 + + + 2009-04-03T13:49:47.437-07:00 + + + 9a00d022-5a20-47f0-b41f-6f82957d151d + + + customer + + + folder + + + Al Brown + + + Al Brown + + + 9a00d022-5a20-47f0-b41f-6f82957d151dparent + + + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-PolicyEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-PolicyEntry.xml new file mode 100755 index 0000000000..ff80fbcaf9 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-PolicyEntry.xml @@ -0,0 +1,62 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:28a6be27-74e6-4742-845f-d07ea48e724c + + + + + + + 2009-04-03T13:49:48.250-07:00 + HTML summary of Entry 28a6be27-74e6-4742-845f-d07ea48e724c + CMIS Example Policy + 2009-04-03T13:49:48.250-07:00 + + + + false + + + 2009-04-03T13:49:48.265-07:00 + + + 2009-04-03T13:49:48.265-07:00 + + + 28a6be27-74e6-4742-845f-d07ea48e724c + + + policy + + + policy + + + Al Brown + + + Al Brown + + + + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Query.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Query.xml new file mode 100755 index 0000000000..8832d63396 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Query.xml @@ -0,0 +1,8 @@ + + + SELECT * FROM Document + true + 50 + 0 + true + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-RelationshipEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-RelationshipEntry.xml new file mode 100755 index 0000000000..e1dc200773 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-RelationshipEntry.xml @@ -0,0 +1,62 @@ + + + + Al Brown + http://www.ibm.com/ + albertcbrown@us.ibm.com + + + urn:uuid:49c09b66-f6e2-48be-8e81-dfafb16983bb + + + + + + + 2009-04-03T13:49:49.187-07:00 + HTML summary of Entry 49c09b66-f6e2-48be-8e81-dfafb16983bb + CMIS Example Relationship as Compound Document type + 2009-04-03T13:49:49.187-07:00 + + + + false + + + 2009-04-03T13:49:49.187-07:00 + + + 2009-04-03T13:49:49.187-07:00 + + + 49c09b66-f6e2-48be-8e81-dfafb16983bb + + + compounddocument + + + relationship + + + Al Brown + + + Al Brown + + + + true + true + true + true + true + true + true + true + true + true + true + + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Service.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Service.xml new file mode 100755 index 0000000000..cdc7ffd07a --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/Ex-Service.xml @@ -0,0 +1,61 @@ + + + + + Sample + + repid1 + Repository1 + + self + CMIS Repository Description + CMIS Vendor 1 + + Alfresco Repository (${server.edition}) + + ${server.version} + rootfolder + + true + true + true + true + true + true + bothcombined + innerandouter + includeDocuments + includeFolders + includeRelationships + includeProperties + includeACL + true + + 0.60 + + + Checkedout collection + application/atom+xml;type=entry + + + Query collection + application/cmisquery+xml + + + Root children collection + + + Root descendants collection + + + Types children collection + + + Types descendants collection + + + Unfiled collection + application/atom+xml;type=entry + + + diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-AllowableActions.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-AllowableActions.xml deleted file mode 100755 index 46ee1a5ad7..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-AllowableActions.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - cmis:parentId - http://tempuri.org - - - true - - - true - true - - - true - - - true - - - true - - - true - true - true - true - true - true - true - true - true - true - - - true - true - - - true - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentEntry.xml deleted file mode 100755 index 62d7f7a723..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentEntry.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - Al Brown - - - - - - - - http://www.cmis.org/rep1/document-entry - - - - - - - - - - - - - - - - - - - 2001-12-31T12:00:00 - - - - Document Entry example - - - 2001-12-31T12:00:00 - - - - - false - - http://www.cmis.org/rep1/media/document-entry - true - true - true - false - false - abrown - 2001-12-31T12:00:00 - docid1 - - 70 - - email - document - - This is the - initial comment - 1.0 - text/plain - name - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentPWCEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentPWCEntry.xml deleted file mode 100755 index 75889c7ed8..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-DocumentPWCEntry.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - Al Brown - - - - - - - - http://www.cmis.org/rep1/document-entry - - - - - - - - - - - - - - - - - - - 2001-12-31T12:00:00 - - - - Document Entry example - - - 2001-12-31T12:00:00 - - - - - - docid1pwc - email - - - true - - true - false - false - false - - - true - 2007-12-31T12:00:00 - 2007-12-31T12:00:00 - - - - docidpwc - 70 - - document - - - Al Brown - This is the - initial checkin comment - - - 1.1 - text/plain - foo.txt - - http://www.cmis.org/rep1/media/document-entry - - - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - true - - - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren.xml deleted file mode 100755 index c41960d719..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren.xml +++ /dev/null @@ -1,265 +0,0 @@ - - - - - - Al Brown - - - http://www.cmis.org/rep1/folder1/children/3 - - - - - - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderEntry.xml deleted file mode 100755 index efeef5f5ae..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderEntry.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - Al Brown - - - - - - - Folder Entry Example (folderid1) Property1 Value1 - - - - http://www.cmis.org/rep1/folder-entry - - - - - - - - - - - - - 2001-12-31T12:00:00 - Folder Entry example - - - 2001-12-31T12:00:00 - - - - 2001-12-31T12:00:00 - - - 2001-12-31T12:00:00 - - folderid1 - parentFolderId1 - - emailfolder - - - folder - - - - - true - true - true - true - true - true - true - true - true - - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-PolicyEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-PolicyEntry.xml deleted file mode 100755 index 66c0f032c5..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-PolicyEntry.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - Al Brown - - - - - - Policy Entry Example (policyid1) Property1 Value1 - - - - http://www.cmis.org/rep1/policy-entry - - - - - - - - - - - - - 2001-12-31T12:00:00 - Policy Entry example - - - 2001-12-31T12:00:00 - - - - 2001-12-31T12:00:00 - - - 2001-12-31T12:00:00 - - - policyid1 - - - security policy - - - policy - - - - - true - true - true - true - true - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Query.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Query.xml deleted file mode 100755 index 3e93208fe6..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Query.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - SELECT * FROM document - true - 0 - 0 - false - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-RelationshipEntry.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-RelationshipEntry.xml deleted file mode 100755 index b5308e9794..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-RelationshipEntry.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - Al Brown - - - - - - Relationship Entry Example (relid1) Property1 Value1 - - - - http://www.cmis.org/rep1/relationship-entry - - - - - - - - - - - - - 2001-12-31T12:00:00 - Relationship Entry example - - - 2001-12-31T12:00:00 - - - - 2001-12-31T12:00:00 - - - 2001-12-31T12:00:00 - - - relid1 - - - docid1 - - - docid2 - - - emaillink - - - relationship - - - - - true - true - true - true - true - - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Service.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Service.xml deleted file mode 100755 index faf722b305..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-Service.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - Repository 1 - - repid1 - repository1 - Self - Repository Description - ACME Vendor - ACME Repository - ACME Version 99.01 - rootFolderId - - true - true - true - true - true - true - fulltextonly - innerandouter - fulltextandstructured - - 0.43 - Local Message in vendor specific schema - - - unfiled collection - - - root collection - - - root collection - - - checkedout collection - - - type collection - - - type collection - - - type collection - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/example_feed.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/example_feed.xml deleted file mode 100644 index 072c9ba04d..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/example_feed.xml +++ /dev/null @@ -1,40 +0,0 @@ - -System -Alfresco (Community Network) -http://localhost:8080/alfresco/images/logo/AlfrescoLogo16.ico -urn:uuid:78974cc9-2e91-11dd-add7-d79ea16aaad7 -Company Home -2008-05-30T22:44:50.379+01:00 - -31 -0 -0 - - - -System -78aef380-2e91-11dd-add7-d79ea16aaad7 -urn:uuid:78aef380-2e91-11dd-add7-d79ea16aaad7 -2008-05-30T22:43:42.120+01:00 -User managed definitions -Data Dictionary -2008-05-30T22:44:50.575+01:00 - -2008-05-30T22:44:50.575+01:00 - -http://localhost:8080/alfresco/images/icons/space-icon-default-16.gif - - - - - - workspace://SpacesStore/78aef380-2e91-11dd-add7-d79ea16aaad7 - folder - - 2008-05-30T22:43:42.120+01:00 - - 2008-05-30T22:44:50.575+01:00 - Data Dictionary - workspace://SpacesStore/78974cc9-2e91-11dd-add7-d79ea16aaad7 - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren-Alfresco.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/example_folderchildren_alfresco.xml similarity index 95% rename from source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren-Alfresco.xml rename to source/java/org/alfresco/repo/cmis/rest/xsd/example_folderchildren_alfresco.xml index 5f17281a27..0e8fcebe5c 100644 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/Example-FolderChildren-Alfresco.xml +++ b/source/java/org/alfresco/repo/cmis/rest/xsd/example_folderchildren_alfresco.xml @@ -1,5 +1,5 @@ - + System Alfresco (Labs) http://localhost:80/alfresco/images/logo/AlfrescoLogo16.ico diff --git a/source/java/org/alfresco/repo/cmis/rest/xsd/example_service.xml b/source/java/org/alfresco/repo/cmis/rest/xsd/example_service.xml deleted file mode 100644 index b7041fb883..0000000000 --- a/source/java/org/alfresco/repo/cmis/rest/xsd/example_service.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - Main Repository - - - - 786f2b47-2e91-11dd-add7-d79ea16aaad7 - Main Repository - - Alfresco - Alfresco Repository (Community Network) - 3.0.0 (SeaMistPreview1 @build-number@) - - true - false - false - true - false - true - true - fulltextwithmetadata - - - - - - - CMIS root folder - - - CMIS checked-out documents - - - CMIS Types - - - - - \ No newline at end of file diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java index d9b9f227ec..60276feb8d 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java @@ -41,7 +41,6 @@ import org.alfresco.cmis.CMISChoice; import org.alfresco.cmis.CMISContentStreamAllowedEnum; import org.alfresco.cmis.CMISDataTypeEnum; import org.alfresco.cmis.CMISDictionaryModel; -import org.alfresco.cmis.CMISFullTextSearchEnum; import org.alfresco.cmis.CMISJoinEnum; import org.alfresco.cmis.CMISPropertyDefinition; import org.alfresco.cmis.CMISTypeDefinition; @@ -57,7 +56,6 @@ import org.alfresco.service.descriptor.Descriptor; @javax.jws.WebService(name = "RepositoryServicePort", serviceName = "RepositoryService", portName = "RepositoryServicePort", targetNamespace = "http://www.cmis.org/ns/1.0", endpointInterface = "org.alfresco.repo.cmis.ws.RepositoryServicePort") public class DMRepositoryServicePort extends DMAbstractServicePort implements RepositoryServicePort { - private static Map fulltextEnumMapping; private static Map joinEnumMapping; private static Map contentStreamAllowedEnumMapping; private static Map updatabilityEnumMapping; @@ -66,11 +64,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re static { - fulltextEnumMapping = new HashMap(); - fulltextEnumMapping.put(CMISFullTextSearchEnum.NO_FULL_TEXT, EnumCapabilityFullText.NONE); - fulltextEnumMapping.put(CMISFullTextSearchEnum.FULL_TEXT_ONLY, EnumCapabilityFullText.FULLTEXTONLY); - fulltextEnumMapping.put(CMISFullTextSearchEnum.FULL_TEXT_AND_STRUCTURED, EnumCapabilityFullText.FULLTEXTANDSTRUCTURED); - joinEnumMapping = new HashMap(); joinEnumMapping.put(CMISJoinEnum.INNER_AND_OUTER_JOIN_SUPPORT, EnumCapabilityJoin.INNERANDOUTER); joinEnumMapping.put(CMISJoinEnum.INNER_JOIN_SUPPORT, EnumCapabilityJoin.INNERONLY); @@ -158,7 +151,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re capabilities.setCapabilityPWCUpdateable(true); capabilities.setCapabilityAllVersionsSearchable(cmisQueryService.getAllVersionsSearchable()); capabilities.setCapabilityJoin(joinEnumMapping.get(cmisQueryService.getJoinSupport())); - capabilities.setCapabilityFullText(fulltextEnumMapping.get(cmisQueryService.getFullTextSearchSupport())); repositoryInfoType.setCapabilities(capabilities); repositoryInfoType.setCmisVersionsSupported(cmisService.getCMISVersion()); @@ -311,9 +303,9 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re cmisTypeDefinition.setTypeId(typeDefinition.getTypeId().getId()); cmisTypeDefinition.setQueryName(typeDefinition.getQueryName()); cmisTypeDefinition.setDisplayName(typeDefinition.getDisplayName()); - cmisTypeDefinition.setBaseType(EnumObjectType.fromValue(typeDefinition.getRootType().getTypeId().getId())); + cmisTypeDefinition.setBaseType(EnumObjectType.fromValue(typeDefinition.getBaseType().getTypeId().getId())); cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId()); - cmisTypeDefinition.setBaseTypeQueryName(typeDefinition.getRootType().getQueryName()); + cmisTypeDefinition.setBaseTypeQueryName(typeDefinition.getBaseType().getQueryName()); cmisTypeDefinition.setDescription(typeDefinition.getDescription()); cmisTypeDefinition.setCreatable(typeDefinition.isCreatable()); cmisTypeDefinition.setFileable(typeDefinition.isFileable());