diff --git a/config/alfresco/cmis-ws-context.xml b/config/alfresco/cmis-ws-context.xml index 72c558545b..b532ca7787 100644 --- a/config/alfresco/cmis-ws-context.xml +++ b/config/alfresco/cmis-ws-context.xml @@ -5,12 +5,10 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> - - @@ -152,26 +150,21 @@ - - - workspace://SpacesStore/app:company_home - - + - - - - - - - - - + + + + + + + + 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 f19aa64962..6f912a7c5a 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 @@ -4,8 +4,8 @@ [#-- ATOM Entry for Document --] [#-- --] -[#macro document node] -${node.properties.creator} +[#macro document node propfilter="*"] +${node.properties.creator!""} urn:uuid:${node.id} @@ -17,9 +17,9 @@ ${node.properties.description!node.properties.title!cropContent(node, 50)} ${node.name} ${xmldate(node.properties.modified)} -[@documentCMISProps node=node/] -${xmldate(node.properties.modified)} -${absurl(url.context)}${node.icon16} +[@documentCMISProps node propfilter/] +[#-- TODO: custom ns ${xmldate(node.properties.modified)} --] +[#-- TODO: custom ns ${absurl(url.context)}${node.icon16} --] [/#macro] [#macro documentCMISLinks node] @@ -31,30 +31,30 @@ [/#macro] -[#macro documentCMISProps node] +[#macro documentCMISProps node propfilter] - ${cmisproperty(node, "IS_IMMUTABLE")?string} - ${cmisproperty(node, "IS_LATEST_VERSION")?string} - ${cmisproperty(node, "IS_MAJOR_VERSION")?string} - ${cmisproperty(node, "IS_LATEST_MAJOR_VERSION")?string} - ${cmisproperty(node, "VERSION_SERIES_IS_CHECKED_OUT")?string} - ${xmldate(node.properties.created)} - ${xmldate(node.properties.modified)} - ${node.nodeRef} - ${cmisproperty(node, "VERSION_SERIES_ID")} - ${cmisproperty(node, "VERSION_SERIES_CHECKED_OUT_ID")!""} - ${node.properties.content.size} - ${node.name} - document - ${cmistypeid(node)} - ${node.properties.creator} - ${node.properties.modifier} - ${node.properties.content.mimetype} - ${node.name} - ${cmisproperty(node, "VERSION_LABEL")!""} - ${cmisproperty(node, "VERSION_SERIES_CHECKED_OUT_BY")!""} - ${cmisproperty(node, "CHECKIN_COMMENT")!""} - ${absurl(url.serviceContext)}/api/node/${node.nodeRef.storeRef.protocol}/${node.nodeRef.storeRef.identifier}/${node.nodeRef.id}/content + [@filter propfilter "IS_IMMUTABLE"][@prop "isImmutable" cmisproperty(node, "IS_IMMUTABLE") "Boolean"/][/@filter] + [@filter propfilter "IS_LATEST_VERSION"][@prop "isLatestVersion" cmisproperty(node, "IS_LATEST_VERSION") "Boolean"/][/@filter] + [@filter propfilter "IS_MAJOR_VERSION"][@prop "isMajorVersion" cmisproperty(node, "IS_MAJOR_VERSION") "Boolean"/][/@filter] + [@filter propfilter "IS_LATEST_MAJOR_VERSION"][@prop "isLatestMajorVersion" cmisproperty(node, "IS_LATEST_MAJOR_VERSION") "Boolean"/][/@filter] + [@filter propfilter "VERSION_SERIES_IS_CHECKED_OUT"][@prop "isVersionSeriesCheckedOut" cmisproperty(node, "VERSION_SERIES_IS_CHECKED_OUT") "Boolean"/][/@filter] + [@filter propfilter "CREATION_DATE"][@prop "creationDate" node.properties.created "DateTime"/][/@filter] + [@filter propfilter "LAST_MODIFICATION_DATE"][@prop "lastModificationDate" node.properties.modified "DateTime"/][/@filter] + [@filter propfilter "OBJECT_ID"][@prop "objectId" node.nodeRef "ID"/][/@filter] + [@filter propfilter "VERSION_SERIES_ID"][@prop "versionSeriesID" cmisproperty(node, "VERSION_SERIES_ID") "ID"/][/@filter] + [@filter propfilter "VERSION_SERIES_CHECKED_OUT_ID"][@prop "versionSeriesCheckedOutID" cmisproperty(node, "VERSION_SERIES_CHECKED_OUT_ID")!"" "ID"/][/@filter] + [@filter propfilter "CONTENT_STREAM_LENGTH"][@prop "contentStreamLength" node.properties.content.size "Integer"/][/@filter] + [@filter propfilter "NAME"][@prop "name" node.name "String"/][/@filter] + [@filter propfilter "ROOT_TYPE_QUERY_NAME"][@prop "baseType" "document" "String"/][/@filter] [#-- TODO: spec issue 41 --] + [@filter propfilter "OBJECT_TYPE_ID"][@prop "objectType" cmistypeid(node) "String"/][/@filter] + [@filter propfilter "CREATED_BY"][@prop "createdBy" node.properties.creator "String"/][/@filter] + [@filter propfilter "LAST_MODIFIED_BY"][@prop "lastModifiedBy" node.properties.modifier "String"/][/@filter] + [@filter propfilter "CONTENT_STREAM_MIME_TYPE"][@prop "contentStreamMimetype" node.properties.content.mimetype "String"/][/@filter] + [@filter propfilter "CONTENT_STREAM_FILENAME"][@prop "contentStreamName" node.name "String"/][/@filter] + [@filter propfilter "VERSION_LABEL"][@prop "versionLabel" cmisproperty(node, "VERSION_LABEL")!"" "String"/][/@filter] + [@filter propfilter "VERSION_SERIES_CHECKED_OUT_BY"][@prop "versionSeriesCheckedOutBy" cmisproperty(node, "VERSION_SERIES_CHECKED_OUT_BY")!"" "String"/][/@filter] + [@filter propfilter "CHECKIN_COMMENT"][@prop "checkinComment" cmisproperty(node, "CHECKIN_COMMENT")!"" "String"/][/@filter] + [@filter propfilter "CONTENT_STREAM_URI"][@prop "contentStreamURI" absurl(url.serviceContext) + "/api/node/" + node.nodeRef.storeRef.protocol + "/" + node.nodeRef.storeRef.identifier + "/" + node.nodeRef.id + "/content" "String"/][/@filter] [/#macro] @@ -63,7 +63,7 @@ [#-- ATOM Entry for Version --] [#-- --] -[#macro version node version] +[#macro version node version propfilter="*"] ${node.properties.creator} urn:uuid:${node.id} @@ -74,9 +74,9 @@ ${node.properties.description!node.properties.title!cropContent(node.properties.content, 50)} ${node.name} ${xmldate(node.properties.modified)} -[@documentCMISProps node=node/] -${xmldate(node.properties.modified)} -${absurl(url.context)}${node.icon16} +[@documentCMISProps node propfilter/] +[#-- TODO: custom ns ${xmldate(node.properties.modified)} --] +[#-- TODO: custom ns ${absurl(url.context)}${node.icon16} --] [/#macro] @@ -84,7 +84,7 @@ [#-- ATOM Entry for Private Working Copy --] [#-- --] -[#macro pwc node] +[#macro pwc node propfilter="*"] ${node.properties.creator} urn:uuid:${node.id} @@ -97,10 +97,10 @@ ${node.properties.description!node.properties.title!cropContent(node.properties.content, 50)} ${node.name} ${xmldate(node.properties.modified)} -[@documentCMISProps node=node/] -${xmldate(node.properties.modified)} +[@documentCMISProps node propfilter/] +[#-- TODO: custom ns ${xmldate(node.properties.modified)} --] [#-- TODO: the edit link refers to the updatable node resource, allowing updates on PWCs without checkin --] -${absurl(url.context)}${node.icon16} +[#-- TODO: custom ns ${absurl(url.context)}${node.icon16} --] [/#macro] @@ -108,20 +108,20 @@ [#-- ATOM Entry for Folder --] [#-- --] -[#macro folder node] +[#macro folder node propfilter="*"] ${node.properties.creator} ${node.id} [#-- TODO --] urn:uuid:${node.id} -[@folderCMISLinks node=node/] +[@folderCMISLinks node/] ${xmldate(node.properties.created)} -${node.properties.description!node.properties.title} [#-- TODO --] +${node.properties.description!node.properties.title!""} [#-- TODO --] ${node.name} ${xmldate(node.properties.modified)} -[@folderCMISProps node=node/] -${xmldate(node.properties.modified)} -${absurl(url.context)}${node.icon16} +[@folderCMISProps node propfilter/] +[#-- TODO: custom ns ${xmldate(node.properties.modified)} --] +[#-- TODO: custom ns ${absurl(url.context)}${node.icon16} --] [/#macro] [#macro folderCMISLinks node] @@ -136,21 +136,49 @@ [/#macro] -[#macro folderCMISProps node] +[#macro folderCMISProps node propfilter] - ${xmldate(node.properties.created)} - ${xmldate(node.properties.modified)} - ${node.nodeRef} - ${cmisproperty(node, "PARENT")!""} - ${node.name} - ${cmistypeid(node)} - folder - ${node.properties.creator} - ${node.properties.modifier} + [@filter propfilter "CREATION_DATE"][@prop "creationDate" node.properties.created "DateTime"/][/@filter] + [@filter propfilter "LAST_MODIFICATION_DATE"][@prop "lastModificationDate" node.properties.modified "DateTime"/][/@filter] + [@filter propfilter "OBJECT_ID"][@prop "objectId" node.nodeRef "ID"/][/@filter] + [@filter propfilter "PARENT"][@prop "parent" cmisproperty(node, "PARENT")!"" "ID"/][/@filter] + [@filter propfilter "NAME"][@prop "name" node.name "String"/][/@filter] + [@filter propfilter "ROOT_TYPE_QUERY_NAME"][@prop "baseType" "folder" "String"/][/@filter] [#-- TODO: spec issue 41 --] + [@filter propfilter "OBJECT_TYPE_ID"][@prop "objectType" cmistypeid(node) "String"/][/@filter] + [@filter propfilter "CREATED_BY"][@prop "createdBy" node.properties.creator "String"/][/@filter] + [@filter propfilter "LAST_MODIFIED_BY"][@prop "lastModifiedBy" node.properties.modifier "String"/][/@filter] [/#macro] +[#-- --] +[#-- ATOM Entry for Query Row --] +[#-- --] + +[#-- TODO: spec issue 47 --] +[#macro row row] +[#if row.nodes??] +[#assign node = row.nodes?first] +${node.properties.creator!""} + +urn:uuid:${node.id} + +${node.name} +${xmldate(node.properties.modified)} +[/#if] +[#assign values = row.values] +[#if values?size > 0] + +[#list values?keys as colname] + [#assign coltype = row.getColumnType(colname)] + [@prop colname values[colname] coltype/] +[/#list] + +[/#if] +[#-- TODO: custom ns ${absurl(url.context)}${node.icon16} --] +[/#macro] + + [#-- --] [#-- ATOM Entry for Type Definition --] [#-- --] @@ -227,6 +255,35 @@ [/#macro] + +[#-- --] +[#-- CMIS Properties --] +[#-- --] + +[#macro filter filter value] +[#if filter == "*" || filter?index_of(value) != -1 || filter?matches(value,'i')][#nested][/#if] +[/#macro] + +[#macro prop name value type] +[#if type == "String"] +${value} +[#elseif type == "Integer"] +${value?c} +[#elseif type == "Decimal"] +${value?c} +[#elseif type == "Boolean"] +${value?string} +[#elseif type == "DateTime"] +${xmldate(value)} +[#elseif type == "URI"] +${value} +[#elseif type == "ID"] +${value} +[#-- TODO: remaining property types --] +[/#if] +[/#macro] + + [#-- TODO: spec issue 40 --] [#macro cmisBaseType rootType] [#if rootType = "DOCUMENT_OBJECT_TYPE"]document[#elseif rootType = "FOLDER_OBJECT_TYPE"]folder[#elseif rootType = "RELATIONSHIP_OBJECT_TYPE"]relationship[#elseif rootType = "POLICY_OBJECT_TYPE"]policy[#else][/#if][/#macro] 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 435d4bc84a..7d3a5e8e4d 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 @@ -4,6 +4,6 @@ [#macro cmisNS]http://www.cmis.org/2008/05[/#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] -[#macro feedNS]xmlns="[@atomNS/]" xmlns:app="[@appNS/]" xmlns:cmis="[@cmisNS/]" xmlns:alf="[@alfNS/]" xmlns:opensearch="[@opensearchNS/]"[/#macro] -[#macro entryNS]xmlns="[@atomNS/]" xmlns:app="[@appNS/]" xmlns:cmis="[@cmisNS/]" xmlns:alf="[@alfNS/]"[/#macro] \ No newline at end of file +[#macro serviceNS]xmlns="[@appNS/]" xmlns:atom="[@atomNS/]" xmlns:cmis="[@cmisNS/]" [#-- TODO: custom ns xmlns:alf="[@alfNS/]" --][/#macro] +[#macro feedNS]xmlns="[@atomNS/]" xmlns:app="[@appNS/]" xmlns:cmis="[@cmisNS/]" [#-- xmlns:alf="[@alfNS/]" xmlns:opensearch="[@opensearchNS/]" --][/#macro] +[#macro entryNS]xmlns="[@atomNS/]" xmlns:app="[@appNS/]" xmlns:cmis="[@cmisNS/]" [#-- xmlns:alf="[@alfNS/]" --][/#macro] \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl index eb4b2eb5a8..e16383b870 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/paging.lib.atom.ftl @@ -1,37 +1,39 @@ -<#macro links cursor pageNo="pageNo" pageSize="pageSize" skipCount="skipCount" maxItems="maxItems"> -<#if cursor.pageType = "PAGE"> -<#if cursor.hasFirstPage> - - -<#if cursor.hasLastPage> - - -<#if cursor.hasPrevPage> - - -<#if cursor.hasNextPage> - - -<#else> -<#if cursor.hasFirstPage> - - -<#if cursor.hasLastPage> - - -<#if cursor.hasPrevPage> - - -<#if cursor.hasNextPage> - - - - +[#ftl] -<#macro opensearch cursor> -<#-- NOTE: this macro requires the definition of xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" in --> -<#-- the enclosing document --> -${cursor.totalRows} -${cursor.startRow} -${cursor.pageSize} - +[#macro links cursor pageNo="pageNo" pageSize="pageSize" skipCount="skipCount" maxItems="maxItems"] +[#if cursor.pageType = "PAGE"] +[#if cursor.hasFirstPage] + +[/#if] +[#if cursor.hasLastPage] + +[/#if] +[#if cursor.hasPrevPage] + +[/#if] +[#if cursor.hasNextPage] + +[/#if] +[#else] +[#if cursor.hasFirstPage] + +[/#if] +[#if cursor.hasLastPage] + +[/#if] +[#if cursor.hasPrevPage] + +[/#if] +[#if cursor.hasNextPage] + +[/#if] +[/#if] +[/#macro] + +[#macro opensearch cursor] +[#-- NOTE: this macro requires the definition of xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" in --] +[#-- the enclosing document --] +[#-- TODO: custom ns ${cursor.totalRows} --] +[#-- TODO: custom ns ${cursor.startRow} --] +[#-- TODO: custom ns ${cursor.pageSize} --] +[/#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 ae09e55993..790aacc6b0 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 @@ -1,6 +1,6 @@ [#ftl] [#import "/org/alfresco/cmis/ns.lib.atom.ftl" as nsLib/] - + ${server.name} @@ -37,7 +37,10 @@ type collection - + + query collection + + diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.atomfeed.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.atomfeed.ftl new file mode 100644 index 0000000000..ce6ef61329 --- /dev/null +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.atomfeed.ftl @@ -0,0 +1,28 @@ +[#ftl] +[#import "/org/alfresco/cmis/ns.lib.atom.ftl" as nsLib/] +[#import "/org/alfresco/cmis/atomfeed.lib.atom.ftl" as feedLib/] +[#import "/org/alfresco/cmis/atomentry.lib.atom.ftl" as entryLib/] +[#import "/org/alfresco/paging.lib.atom.ftl" as pagingLib/] +[#compress] + + + + +[#-- TODO: uuid --] +[@feedLib.generic "urn:uuid:resultset" "Result set for ${statement}" "${person.properties.userName}"] + [@pagingLib.links cursor=cursor/] +[/@feedLib.generic] + +[#assign rs = cmisresultset(resultset)] +[#list rs.rows as row] + + [@entryLib.row row/] + +[/#list] + +[@feedLib.hasMore more=cursor/] +[@pagingLib.opensearch cursor=cursor/] + + + +[/#compress] diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmissqlquery.js b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmissqlquery.js new file mode 100644 index 0000000000..41e8244f51 --- /dev/null +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.cmissqlquery.js @@ -0,0 +1,44 @@ +script: +{ + // process query statement + // + // + // object_id1 + // false + // 0 + // 0 + // false + // + + default xml namespace = 'http://www.cmis.org/2008/05'; + + var cmisQuery = new XML(query); + + // extract query statement + model.statement = cmisQuery.statement.toString(); + if (model.statement == null || model.statement.length == 0) + { + status.setCode(status.STATUS_BAD_REQUEST, "Query statement must be provided"); + break script; + } + + // process search all versions (NOTE: not supported) + var searchAllVersions = cmisQuery.searchAllVersions; + if (searchAllVersions != null && searchAllVersions === "true") + { + status.setCode(status.STATUS_INTERNAL_SERVER_ERROR, "Search all versions not supported"); + break script; + } + + // TODO: process allowableActions + + // process paging + var skipCount = parseInt(cmisQuery.skipCount); + var pageSize = parseInt(cmisQuery.pageSize); + var page = paging.createPageOrWindow(null, null, isNaN(skipCount) ? null : skipCount, isNaN(pageSize) ? null : pageSize); + + // perform query + var paged = cmis.query(model.statement, page); + model.resultset = paged.result; + model.cursor = paged.cursor; +} diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.desc.xml new file mode 100644 index 0000000000..f3791add07 --- /dev/null +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/search/query.post.desc.xml @@ -0,0 +1,8 @@ + + Issue ad-hoc query + Issue ad-hoc query statement + /api/query + user + + CMIS + \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/item.put.atomentry.js b/config/alfresco/templates/webscripts/org/alfresco/repository/store/item.put.atomentry.js index 76f0962e92..c86f26b3e2 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/item.put.atomentry.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/item.put.atomentry.js @@ -12,8 +12,6 @@ script: break script; } - // TODO: check for appropriate permission - // ensure atom entry is posted if (entry === null) { @@ -23,6 +21,15 @@ script: break script; } + // check permissions + if (!model.node.hasPermission("WriteProperties") || !model.node.hasPermission("WriteContent")) + { + status.code = 403; + status.message = "Permission to update is denied"; + status.redirect = true; + break script; + } + // update properties // NOTE: Only CMIS property name is updatable // TODO: support for custom properties diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.ftl index 0bcd0f9db3..e9c9369725 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.ftl @@ -6,7 +6,11 @@ - [@entryLib.document node=node/] + [#if checkin] + [@entryLib.document node/] + [#else] + [@entryLib.pwc node/] + [/#if] [/#compress] \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.js b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.js index 4c9fbf7f9d..a5be379066 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.atomentry.js @@ -3,8 +3,8 @@ script: // locate node var pathSegments = url.match.split("/"); var reference = [ url.templateArgs.store_type, url.templateArgs.store_id ].concat(url.templateArgs.id.split("/")); - var node = cmis.findNode("node", reference); - if (node === null || !node.hasAspect("cm:workingcopy")) + model.node = cmis.findNode("node", reference); + if (model.node === null || !model.node.hasAspect("cm:workingcopy")) { status.code = 404; status.message = "Private working copy " + reference.join("/") + " not found"; @@ -12,13 +12,22 @@ script: break script; } - if (!node.hasPermission("CheckIn")) + // check permissions + model.checkin = cmis.findArg(args.checkin, headers["CMIS-checkin"]) == "true" ? true : false; + if (model.checkin && !model.node.hasPermission("CheckIn")) { status.code = 403; status.message = "Permission to checkin is denied"; status.redirect = true; break script; } + else if (!model.node.hasPermission("WriteProperties") || !model.node.hasPermission("WriteContent")) + { + status.code = 403; + status.message = "Permission to update is denied"; + status.redirect = true; + break script; + } if (entry !== null) { @@ -30,7 +39,7 @@ script: var name = entry.title; if (name !== null) { - node.name = name; + model.node.name = name; updated = true; } @@ -38,7 +47,7 @@ script: var content = entry.content; if (content !== null) { - if (!node.isDocument) + if (!model.node.isDocument) { status.code = 400; status.message = "Cannot update content on folder " + pathSegments[2] + " " + reference.join("/"); @@ -46,22 +55,25 @@ script: break script; } - node.content = content; - node.properties.content.encoding = "UTF-8"; - node.properties.content.mimetype = atom.toMimeType(entry); + model.node.content = content; + model.node.properties.content.encoding = "UTF-8"; + model.node.properties.content.mimetype = atom.toMimeType(entry); updated = true; } // only save if an update actually occurred if (updated) { - node.save(); + model.node.save(); } } // checkin - var comment = cmis.findArg(args.checkinComment, headers["CMIS-checkinComment"]); - var major = cmis.findArg(args.major, headers["CMIS-major"]); - major = (major === null || major == "true") ? true : false; - model.node = node.checkin(comment === null ? "" : comment, major); + if (model.checkin) + { + var comment = cmis.findArg(args.checkinComment, headers["CMIS-checkinComment"]); + var major = cmis.findArg(args.major, headers["CMIS-major"]); + major = (major === null || major == "true") ? true : false; + model.node = model.node.checkin(comment === null ? "" : comment, major); + } } diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.desc.xml index e175de59fa..7c2a293e38 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.desc.xml +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/pwc.put.desc.xml @@ -1,7 +1,7 @@ Checkin Private Working Copy Checkin private working copy - /api/pwc/{store_type}/{store_id}/{id}?checkinComment={checkinComment?}&major={major?} + /api/pwc/{store_type}/{store_id}/{id}?checkinComment={checkinComment?}&major={major?}&checkin={checkin?} user CMIS diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml index eaa06beb4c..1fe43b5bff 100644 --- a/config/alfresco/web-scripts-application-context.xml +++ b/config/alfresco/web-scripts-application-context.xml @@ -112,6 +112,12 @@ + + + + + + diff --git a/source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolder.java b/source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolder.java old mode 100644 new mode 100755 similarity index 55% rename from source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolder.java rename to source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolder.java index 1f0ba66b90..7d6abc57b0 --- a/source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolder.java +++ b/source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolder.java @@ -9,18 +9,19 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for addDocumentToFolder element declaration. + *

Java class for addObjectToFolder element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="addDocumentToFolder">
+ * <element name="addObjectToFolder">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
- *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -32,39 +33,66 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "documentId",
+    "repositoryId",
+    "objectId",
     "folderId"
 })
-@XmlRootElement(name = "addDocumentToFolder")
-public class AddDocumentToFolder {
+@XmlRootElement(name = "addObjectToFolder")
+public class AddObjectToFolder {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected String documentId;
+    protected String repositoryId;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String folderId;
 
     /**
-     * Gets the value of the documentId property.
+     * Gets the value of the repositoryId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getDocumentId() {
-        return documentId;
+    public String getRepositoryId() {
+        return repositoryId;
     }
 
     /**
-     * Sets the value of the documentId property.
+     * Sets the value of the repositoryId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setDocumentId(String value) {
-        this.documentId = value;
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
+    /**
+     * Gets the value of the objectId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * Sets the value of the objectId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setObjectId(String value) {
+        this.objectId = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolderResponse.java b/source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolderResponse.java
old mode 100644
new mode 100755
similarity index 73%
rename from source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolderResponse.java
rename to source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolderResponse.java
index 06a402cd22..ac52df1228
--- a/source/generated/org/alfresco/repo/cmis/ws/AddDocumentToFolderResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/AddObjectToFolderResponse.java
@@ -8,12 +8,12 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * 

Java class for addDocumentToFolderResponse element declaration. + *

Java class for addObjectToFolderResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="addDocumentToFolderResponse">
+ * <element name="addObjectToFolderResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
-@XmlRootElement(name = "addDocumentToFolderResponse")
-public class AddDocumentToFolderResponse {
+@XmlRootElement(name = "addObjectToFolderResponse")
+public class AddObjectToFolderResponse {
 
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/AllowableActionEnum.java b/source/generated/org/alfresco/repo/cmis/ws/AllowableActionEnum.java
new file mode 100755
index 0000000000..24a8107be4
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/AllowableActionEnum.java
@@ -0,0 +1,118 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+
+/**
+ * 

Java class for allowableActionEnum. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+ * <simpleType name="allowableActionEnum">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="canGetProperties"/>
+ *     <enumeration value="canUpdateProperties"/>
+ *     <enumeration value="canDeleteObject"/>
+ *     <enumeration value="canGetObjectParents"/>
+ *     <enumeration value="canGetFolderParent"/>
+ *     <enumeration value="canMoveObject"/>
+ *     <enumeration value="canAddObjectToFolder"/>
+ *     <enumeration value="canRemoveObjectFromFolder"/>
+ *     <enumeration value="canGetRelationships"/>
+ *     <enumeration value="canApplyPolicy"/>
+ *     <enumeration value="canRemovePolicy"/>
+ *     <enumeration value="canGetAppliedPolicies"/>
+ *     <enumeration value="canGetContentStream"/>
+ *     <enumeration value="canSetContentStream"/>
+ *     <enumeration value="canDeleteContentStream"/>
+ *     <enumeration value="canCheckOut"/>
+ *     <enumeration value="canCancelCheckout"/>
+ *     <enumeration value="canCheckIn"/>
+ *     <enumeration value="canGetChildren"/>
+ *     <enumeration value="canGetDescendants"/>
+ *     <enumeration value="canCreateDocument"/>
+ *     <enumeration value="canCreateFolder"/>
+ *     <enumeration value="canCreateRelationship"/>
+ *     <enumeration value="canCreatePolicy"/>
+ *     <enumeration value="canDeleteTree"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlEnum +public enum AllowableActionEnum { + + @XmlEnumValue("canAddObjectToFolder") + CAN_ADD_OBJECT_TO_FOLDER("canAddObjectToFolder"), + @XmlEnumValue("canApplyPolicy") + CAN_APPLY_POLICY("canApplyPolicy"), + @XmlEnumValue("canCancelCheckout") + CAN_CANCEL_CHECKOUT("canCancelCheckout"), + @XmlEnumValue("canCheckIn") + CAN_CHECK_IN("canCheckIn"), + @XmlEnumValue("canCheckOut") + CAN_CHECK_OUT("canCheckOut"), + @XmlEnumValue("canCreateDocument") + CAN_CREATE_DOCUMENT("canCreateDocument"), + @XmlEnumValue("canCreateFolder") + CAN_CREATE_FOLDER("canCreateFolder"), + @XmlEnumValue("canCreatePolicy") + CAN_CREATE_POLICY("canCreatePolicy"), + @XmlEnumValue("canCreateRelationship") + CAN_CREATE_RELATIONSHIP("canCreateRelationship"), + @XmlEnumValue("canDeleteContentStream") + CAN_DELETE_CONTENT_STREAM("canDeleteContentStream"), + @XmlEnumValue("canDeleteObject") + CAN_DELETE_OBJECT("canDeleteObject"), + @XmlEnumValue("canDeleteTree") + CAN_DELETE_TREE("canDeleteTree"), + @XmlEnumValue("canGetAppliedPolicies") + CAN_GET_APPLIED_POLICIES("canGetAppliedPolicies"), + @XmlEnumValue("canGetChildren") + CAN_GET_CHILDREN("canGetChildren"), + @XmlEnumValue("canGetContentStream") + CAN_GET_CONTENT_STREAM("canGetContentStream"), + @XmlEnumValue("canGetDescendants") + CAN_GET_DESCENDANTS("canGetDescendants"), + @XmlEnumValue("canGetFolderParent") + CAN_GET_FOLDER_PARENT("canGetFolderParent"), + @XmlEnumValue("canGetObjectParents") + CAN_GET_OBJECT_PARENTS("canGetObjectParents"), + @XmlEnumValue("canGetProperties") + CAN_GET_PROPERTIES("canGetProperties"), + @XmlEnumValue("canGetRelationships") + CAN_GET_RELATIONSHIPS("canGetRelationships"), + @XmlEnumValue("canMoveObject") + CAN_MOVE_OBJECT("canMoveObject"), + @XmlEnumValue("canRemoveObjectFromFolder") + CAN_REMOVE_OBJECT_FROM_FOLDER("canRemoveObjectFromFolder"), + @XmlEnumValue("canRemovePolicy") + CAN_REMOVE_POLICY("canRemovePolicy"), + @XmlEnumValue("canSetContentStream") + CAN_SET_CONTENT_STREAM("canSetContentStream"), + @XmlEnumValue("canUpdateProperties") + CAN_UPDATE_PROPERTIES("canUpdateProperties"); + private final String value; + + AllowableActionEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + public static AllowableActionEnum fromValue(String v) { + for (AllowableActionEnum c: AllowableActionEnum.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v.toString()); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsEnum.java b/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsEnum.java deleted file mode 100644 index c65752dc77..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsEnum.java +++ /dev/null @@ -1,94 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - - -/** - *

Java class for allowableActionsEnum. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

- * <simpleType name="allowableActionsEnum">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="delete"/>
- *     <enumeration value="updateProperties"/>
- *     <enumeration value="checkOut"/>
- *     <enumeration value="cancelCheckOut"/>
- *     <enumeration value="checkIn"/>
- *     <enumeration value="deleteVersion"/>
- *     <enumeration value="addToFolder"/>
- *     <enumeration value="removeFromFolder"/>
- *     <enumeration value="setContent"/>
- *     <enumeration value="deleteContent"/>
- *     <enumeration value="getAllVersions"/>
- *     <enumeration value="getChilderen"/>
- *     <enumeration value="getParents"/>
- *     <enumeration value="getRelationships"/>
- *     <enumeration value="getProperties"/>
- *     <enumeration value="viewContent"/>
- *     <enumeration value="move"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlEnum -public enum AllowableActionsEnum { - - @XmlEnumValue("addToFolder") - ADD_TO_FOLDER("addToFolder"), - @XmlEnumValue("cancelCheckOut") - CANCEL_CHECK_OUT("cancelCheckOut"), - @XmlEnumValue("checkIn") - CHECK_IN("checkIn"), - @XmlEnumValue("checkOut") - CHECK_OUT("checkOut"), - @XmlEnumValue("delete") - DELETE("delete"), - @XmlEnumValue("deleteContent") - DELETE_CONTENT("deleteContent"), - @XmlEnumValue("deleteVersion") - DELETE_VERSION("deleteVersion"), - @XmlEnumValue("getAllVersions") - GET_ALL_VERSIONS("getAllVersions"), - @XmlEnumValue("getChilderen") - GET_CHILDEREN("getChilderen"), - @XmlEnumValue("getParents") - GET_PARENTS("getParents"), - @XmlEnumValue("getProperties") - GET_PROPERTIES("getProperties"), - @XmlEnumValue("getRelationships") - GET_RELATIONSHIPS("getRelationships"), - @XmlEnumValue("move") - MOVE("move"), - @XmlEnumValue("removeFromFolder") - REMOVE_FROM_FOLDER("removeFromFolder"), - @XmlEnumValue("setContent") - SET_CONTENT("setContent"), - @XmlEnumValue("updateProperties") - UPDATE_PROPERTIES("updateProperties"), - @XmlEnumValue("viewContent") - VIEW_CONTENT("viewContent"); - private final String value; - - AllowableActionsEnum(String v) { - value = v; - } - - public String value() { - return value; - } - - public static AllowableActionsEnum fromValue(String v) { - for (AllowableActionsEnum c: AllowableActionsEnum.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v.toString()); - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsType.java b/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsType.java new file mode 100755 index 0000000000..1a5ff735dc --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/AllowableActionsType.java @@ -0,0 +1,69 @@ + +package org.alfresco.repo.cmis.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for allowableActionsType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="allowableActionsType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="action" type="{http://www.cmis.org/ns/1.0}allowableActionEnum" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "allowableActionsType", propOrder = { + "action" +}) +public class AllowableActionsType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List action; + + /** + * Gets the value of the action property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the action property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getAction().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link AllowableActionEnum } + * + * + */ + public List getAction() { + if (action == null) { + action = new ArrayList(); + } + return this.action; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/AlreadyExistsException.java b/source/generated/org/alfresco/repo/cmis/ws/AlreadyExistsException.java deleted file mode 100644 index 2a943e8a85..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/AlreadyExistsException.java +++ /dev/null @@ -1,46 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.ws.WebFault; - - -/** - * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 - * Generated source version: 2.0.6 - * - */ - -@WebFault(name = "AlreadyExistsFault", targetNamespace = "http://www.cmis.org/ns/1.0") - -public class AlreadyExistsException extends Exception { - public static final long serialVersionUID = 20080527141113L; - - private org.alfresco.repo.cmis.ws.BasicFault alreadyExistsFault; - - public AlreadyExistsException() { - super(); - } - - public AlreadyExistsException(String message) { - super(message); - } - - public AlreadyExistsException(String message, Throwable cause) { - super(message, cause); - } - - public AlreadyExistsException(String message, org.alfresco.repo.cmis.ws.BasicFault alreadyExistsFault) { - super(message); - this.alreadyExistsFault = alreadyExistsFault; - } - - public AlreadyExistsException(String message, org.alfresco.repo.cmis.ws.BasicFault alreadyExistsFault, Throwable cause) { - super(message, cause); - this.alreadyExistsFault = alreadyExistsFault; - } - - public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.alreadyExistsFault; - } -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ApplyPolicy.java b/source/generated/org/alfresco/repo/cmis/ws/ApplyPolicy.java new file mode 100755 index 0000000000..6eb0a7b32e --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ApplyPolicy.java @@ -0,0 +1,122 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for applyPolicy element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="applyPolicy">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="policyId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "repositoryId", + "policyId", + "objectId" +}) +@XmlRootElement(name = "applyPolicy") +public class ApplyPolicy { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String policyId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String objectId; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the policyId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPolicyId() { + return policyId; + } + + /** + * Sets the value of the policyId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPolicyId(String value) { + this.policyId = value; + } + + /** + * Gets the value of the objectId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getObjectId() { + return objectId; + } + + /** + * Sets the value of the objectId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setObjectId(String value) { + this.objectId = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolderResponse.java b/source/generated/org/alfresco/repo/cmis/ws/ApplyPolicyResponse.java old mode 100644 new mode 100755 similarity index 71% rename from source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolderResponse.java rename to source/generated/org/alfresco/repo/cmis/ws/ApplyPolicyResponse.java index 2e1f554d69..7ec7124203 --- a/source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolderResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ApplyPolicyResponse.java @@ -8,12 +8,12 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for removeDocumentFromFolderResponse element declaration. + *

Java class for applyPolicyResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="removeDocumentFromFolderResponse">
+ * <element name="applyPolicyResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "")
-@XmlRootElement(name = "removeDocumentFromFolderResponse")
-public class RemoveDocumentFromFolderResponse {
+@XmlRootElement(name = "applyPolicyResponse")
+public class ApplyPolicyResponse {
 
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/BasicFault.java b/source/generated/org/alfresco/repo/cmis/ws/BasicFault.java
index a6ee2a7f5c..dd209f291d 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/BasicFault.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/BasicFault.java
@@ -18,8 +18,8 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
- *         <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="errorMessage" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -35,9 +35,9 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class BasicFault {
 
-    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected BigInteger errorCode;
-    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String errorMessage;
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CancelCheckOut.java b/source/generated/org/alfresco/repo/cmis/ws/CancelCheckOut.java
index b3fb25bbff..585f9d1eca 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CancelCheckOut.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CancelCheckOut.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,14 +32,41 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "documentId"
 })
 @XmlRootElement(name = "cancelCheckOut")
 public class CancelCheckOut {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String documentId;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the documentId property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CapabilitiesType.java b/source/generated/org/alfresco/repo/cmis/ws/CapabilitiesType.java
index 9583eb96d2..b9e3fe9819 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CapabilitiesType.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CapabilitiesType.java
@@ -18,8 +18,12 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="capabilityMultifiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- *         <element name="capabilityUpdatePWC" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityUnfiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityVersionSpecificFiling" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityPWCUpdatable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="capabilityAllVersionsSearchable" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="capabilityJoin" type="{http://www.cmis.org/ns/1.0}joinEnum"/>
+ *         <element name="capabilityFulltext" type="{http://www.cmis.org/ns/1.0}fulltextEnum"/>
  *       </sequence>
  *     </restriction>
  *   </complexContent>
@@ -31,17 +35,29 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "capabilitiesType", propOrder = {
     "capabilityMultifiling",
-    "capabilityUpdatePWC",
-    "capabilityAllVersionsSearchable"
+    "capabilityUnfiling",
+    "capabilityVersionSpecificFiling",
+    "capabilityPWCUpdatable",
+    "capabilityAllVersionsSearchable",
+    "capabilityJoin",
+    "capabilityFulltext"
 })
 public class CapabilitiesType {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected boolean capabilityMultifiling;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
-    protected boolean capabilityUpdatePWC;
+    protected boolean capabilityUnfiling;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
+    protected boolean capabilityVersionSpecificFiling;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
+    protected boolean capabilityPWCUpdatable;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected boolean capabilityAllVersionsSearchable;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected JoinEnum capabilityJoin;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected FulltextEnum capabilityFulltext;
 
     /**
      * Gets the value of the capabilityMultifiling property.
@@ -60,19 +76,51 @@ public class CapabilitiesType {
     }
 
     /**
-     * Gets the value of the capabilityUpdatePWC property.
+     * Gets the value of the capabilityUnfiling property.
      * 
      */
-    public boolean isCapabilityUpdatePWC() {
-        return capabilityUpdatePWC;
+    public boolean isCapabilityUnfiling() {
+        return capabilityUnfiling;
     }
 
     /**
-     * Sets the value of the capabilityUpdatePWC property.
+     * Sets the value of the capabilityUnfiling property.
      * 
      */
-    public void setCapabilityUpdatePWC(boolean value) {
-        this.capabilityUpdatePWC = value;
+    public void setCapabilityUnfiling(boolean value) {
+        this.capabilityUnfiling = value;
+    }
+
+    /**
+     * Gets the value of the capabilityVersionSpecificFiling property.
+     * 
+     */
+    public boolean isCapabilityVersionSpecificFiling() {
+        return capabilityVersionSpecificFiling;
+    }
+
+    /**
+     * Sets the value of the capabilityVersionSpecificFiling property.
+     * 
+     */
+    public void setCapabilityVersionSpecificFiling(boolean value) {
+        this.capabilityVersionSpecificFiling = value;
+    }
+
+    /**
+     * Gets the value of the capabilityPWCUpdatable property.
+     * 
+     */
+    public boolean isCapabilityPWCUpdatable() {
+        return capabilityPWCUpdatable;
+    }
+
+    /**
+     * Sets the value of the capabilityPWCUpdatable property.
+     * 
+     */
+    public void setCapabilityPWCUpdatable(boolean value) {
+        this.capabilityPWCUpdatable = value;
     }
 
     /**
@@ -91,4 +139,52 @@ public class CapabilitiesType {
         this.capabilityAllVersionsSearchable = value;
     }
 
+    /**
+     * Gets the value of the capabilityJoin property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JoinEnum }
+     *     
+     */
+    public JoinEnum getCapabilityJoin() {
+        return capabilityJoin;
+    }
+
+    /**
+     * Sets the value of the capabilityJoin property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JoinEnum }
+     *     
+     */
+    public void setCapabilityJoin(JoinEnum value) {
+        this.capabilityJoin = value;
+    }
+
+    /**
+     * Gets the value of the capabilityFulltext property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FulltextEnum }
+     *     
+     */
+    public FulltextEnum getCapabilityFulltext() {
+        return capabilityFulltext;
+    }
+
+    /**
+     * Sets the value of the capabilityFulltext property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FulltextEnum }
+     *     
+     */
+    public void setCapabilityFulltext(FulltextEnum value) {
+        this.capabilityFulltext = value;
+    }
+
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CheckIn.java b/source/generated/org/alfresco/repo/cmis/ws/CheckIn.java
index f298f52633..6e6f278d0e 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CheckIn.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CheckIn.java
@@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element name="major" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *           <element name="properties" type="{http://www.cmis.org/ns/1.0}documentObjectType" minOccurs="0"/>
+ *           <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType" minOccurs="0"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}contentStream" minOccurs="0"/>
  *           <element name="checkinComment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         </sequence>
@@ -35,6 +36,7 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "documentId",
     "major",
     "properties",
@@ -44,17 +46,43 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "checkIn")
 public class CheckIn {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String documentId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected Boolean major;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
-    protected DocumentObjectType properties;
+    protected PropertiesType properties;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
-    protected ContentStream contentStream;
+    protected ContentStreamType contentStream;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String checkinComment;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the documentId property.
      * 
@@ -108,10 +136,10 @@ public class CheckIn {
      * 
      * @return
      *     possible object is
-     *     {@link DocumentObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public DocumentObjectType getProperties() {
+    public PropertiesType getProperties() {
         return properties;
     }
 
@@ -120,10 +148,10 @@ public class CheckIn {
      * 
      * @param value
      *     allowed object is
-     *     {@link DocumentObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public void setProperties(DocumentObjectType value) {
+    public void setProperties(PropertiesType value) {
         this.properties = value;
     }
 
@@ -132,10 +160,10 @@ public class CheckIn {
      * 
      * @return
      *     possible object is
-     *     {@link ContentStream }
+     *     {@link ContentStreamType }
      *     
      */
-    public ContentStream getContentStream() {
+    public ContentStreamType getContentStream() {
         return contentStream;
     }
 
@@ -144,10 +172,10 @@ public class CheckIn {
      * 
      * @param value
      *     allowed object is
-     *     {@link ContentStream }
+     *     {@link ContentStreamType }
      *     
      */
-    public void setContentStream(ContentStream value) {
+    public void setContentStream(ContentStreamType value) {
         this.contentStream = value;
     }
 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CheckInResponse.java b/source/generated/org/alfresco/repo/cmis/ws/CheckInResponse.java
index b40c57fea8..f4a5cdbf78 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CheckInResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CheckInResponse.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CheckOut.java b/source/generated/org/alfresco/repo/cmis/ws/CheckOut.java
index 75c5e4dd7d..1fbef70246 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CheckOut.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CheckOut.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,14 +32,41 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "documentId"
 })
 @XmlRootElement(name = "checkOut")
 public class CheckOut {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String documentId;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the documentId property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CheckOutResponse.java b/source/generated/org/alfresco/repo/cmis/ws/CheckOutResponse.java
index ec022a690e..57b077eafa 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CheckOutResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CheckOutResponse.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element name="contentCopied" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         </sequence>
  *       </restriction>
diff --git a/source/generated/org/alfresco/repo/cmis/ws/Children.java b/source/generated/org/alfresco/repo/cmis/ws/Children.java
deleted file mode 100644
index 1068ab3d0c..0000000000
--- a/source/generated/org/alfresco/repo/cmis/ws/Children.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 

Java class for children element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="children">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}documentOrFolderObjectType" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "object" -}) -@XmlRootElement(name = "children") -public class Children { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List object; - - /** - * Gets the value of the object property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the object property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getObject().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link DocumentOrFolderObjectType } - * - * - */ - public List getObject() { - if (object == null) { - object = new ArrayList(); - } - return this.object; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ChildrenType.java b/source/generated/org/alfresco/repo/cmis/ws/ChildrenType.java new file mode 100755 index 0000000000..9a97cb6168 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ChildrenType.java @@ -0,0 +1,69 @@ + +package org.alfresco.repo.cmis.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for childrenType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="childrenType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="child" type="{http://www.cmis.org/ns/1.0}folderTreeType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "childrenType", propOrder = { + "child" +}) +public class ChildrenType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List child; + + /** + * Gets the value of the child property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the child property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getChild().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link FolderTreeType } + * + * + */ + public List getChild() { + if (child == null) { + child = new ArrayList(); + } + return this.child; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ConcurrencyException.java b/source/generated/org/alfresco/repo/cmis/ws/ConcurrencyException.java deleted file mode 100644 index 99ddc4643f..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/ConcurrencyException.java +++ /dev/null @@ -1,46 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.ws.WebFault; - - -/** - * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 - * Generated source version: 2.0.6 - * - */ - -@WebFault(name = "ConcurrencyFault", targetNamespace = "http://www.cmis.org/ns/1.0") - -public class ConcurrencyException extends Exception { - public static final long serialVersionUID = 20080527141127L; - - private org.alfresco.repo.cmis.ws.BasicFault concurrencyFault; - - public ConcurrencyException() { - super(); - } - - public ConcurrencyException(String message) { - super(message); - } - - public ConcurrencyException(String message, Throwable cause) { - super(message, cause); - } - - public ConcurrencyException(String message, org.alfresco.repo.cmis.ws.BasicFault concurrencyFault) { - super(message); - this.concurrencyFault = concurrencyFault; - } - - public ConcurrencyException(String message, org.alfresco.repo.cmis.ws.BasicFault concurrencyFault, Throwable cause) { - super(message, cause); - this.concurrencyFault = concurrencyFault; - } - - public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.concurrencyFault; - } -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ConstraintViolationException.java b/source/generated/org/alfresco/repo/cmis/ws/ConstraintViolationException.java index 3d1a5768be..7f6ab31144 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/ConstraintViolationException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ConstraintViolationException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "ConstraintViolationFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "constraintViolationException", targetNamespace = "http://www.cmis.org/ns/1.0") public class ConstraintViolationException extends Exception { - public static final long serialVersionUID = 20080527141113L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault constraintViolationFault; + private org.alfresco.repo.cmis.ws.BasicFault constraintViolationException; public ConstraintViolationException() { super(); @@ -30,17 +30,17 @@ public class ConstraintViolationException extends Exception { super(message, cause); } - public ConstraintViolationException(String message, org.alfresco.repo.cmis.ws.BasicFault constraintViolationFault) { + public ConstraintViolationException(String message, org.alfresco.repo.cmis.ws.BasicFault constraintViolationException) { super(message); - this.constraintViolationFault = constraintViolationFault; + this.constraintViolationException = constraintViolationException; } - public ConstraintViolationException(String message, org.alfresco.repo.cmis.ws.BasicFault constraintViolationFault, Throwable cause) { + public ConstraintViolationException(String message, org.alfresco.repo.cmis.ws.BasicFault constraintViolationException, Throwable cause) { super(message, cause); - this.constraintViolationFault = constraintViolationFault; + this.constraintViolationException = constraintViolationException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.constraintViolationFault; + return this.constraintViolationException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/ContentAlreadyExistsException.java b/source/generated/org/alfresco/repo/cmis/ws/ContentAlreadyExistsException.java new file mode 100755 index 0000000000..bff3135e0e --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ContentAlreadyExistsException.java @@ -0,0 +1,46 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.ws.WebFault; + + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:21:47 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebFault(name = "contentAlreadyExistsException", targetNamespace = "http://www.cmis.org/ns/1.0") + +public class ContentAlreadyExistsException extends Exception { + public static final long serialVersionUID = 20080729182147L; + + private org.alfresco.repo.cmis.ws.BasicFault contentAlreadyExistsException; + + public ContentAlreadyExistsException() { + super(); + } + + public ContentAlreadyExistsException(String message) { + super(message); + } + + public ContentAlreadyExistsException(String message, Throwable cause) { + super(message, cause); + } + + public ContentAlreadyExistsException(String message, org.alfresco.repo.cmis.ws.BasicFault contentAlreadyExistsException) { + super(message); + this.contentAlreadyExistsException = contentAlreadyExistsException; + } + + public ContentAlreadyExistsException(String message, org.alfresco.repo.cmis.ws.BasicFault contentAlreadyExistsException, Throwable cause) { + super(message, cause); + this.contentAlreadyExistsException = contentAlreadyExistsException; + } + + public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { + return this.contentAlreadyExistsException; + } +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ContentStream.java b/source/generated/org/alfresco/repo/cmis/ws/ContentStream.java deleted file mode 100644 index 7440502dcd..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/ContentStream.java +++ /dev/null @@ -1,148 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for contentStream element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="contentStream">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="mimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *           <element ref="{http://www.cmis.org/ns/1.0}name" minOccurs="0"/>
- *           <element name="uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *           <element name="stream" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "mimeType", - "name", - "uri", - "stream" -}) -@XmlRootElement(name = "contentStream") -public class ContentStream { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String mimeType; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String name; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String uri; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected byte[] stream; - - /** - * Gets the value of the mimeType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMimeType() { - return mimeType; - } - - /** - * Sets the value of the mimeType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMimeType(String value) { - this.mimeType = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the uri property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUri() { - return uri; - } - - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUri(String value) { - this.uri = value; - } - - /** - * Gets the value of the stream property. - * - * @return - * possible object is - * byte[] - */ - public byte[] getStream() { - return stream; - } - - /** - * Sets the value of the stream property. - * - * @param value - * allowed object is - * byte[] - */ - public void setStream(byte[] value) { - this.stream = ((byte[]) value); - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ContentStreamAllowedEnum.java b/source/generated/org/alfresco/repo/cmis/ws/ContentStreamAllowedEnum.java new file mode 100755 index 0000000000..48050e5157 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ContentStreamAllowedEnum.java @@ -0,0 +1,52 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; + + +/** + *

Java class for contentStreamAllowedEnum. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+ * <simpleType name="contentStreamAllowedEnum">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="notAllowed"/>
+ *     <enumeration value="allowed"/>
+ *     <enumeration value="required"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlEnum +public enum ContentStreamAllowedEnum { + + @XmlEnumValue("allowed") + ALLOWED("allowed"), + @XmlEnumValue("notAllowed") + NOT_ALLOWED("notAllowed"), + @XmlEnumValue("required") + REQUIRED("required"); + private final String value; + + ContentStreamAllowedEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + public static ContentStreamAllowedEnum fromValue(String v) { + for (ContentStreamAllowedEnum c: ContentStreamAllowedEnum.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v.toString()); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ContentStreamType.java b/source/generated/org/alfresco/repo/cmis/ws/ContentStreamType.java new file mode 100755 index 0000000000..36bf0c1bc7 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ContentStreamType.java @@ -0,0 +1,178 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlMimeType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for contentStreamType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="contentStreamType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="length" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="mimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="filename" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="stream" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "contentStreamType", propOrder = { + "length", + "mimeType", + "filename", + "uri", + "stream" +}) +public class ContentStreamType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected BigInteger length; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String mimeType; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String filename; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String uri; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + @XmlMimeType("application/octet-stream") + protected DataHandler stream; + + /** + * Gets the value of the length property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getLength() { + return length; + } + + /** + * Sets the value of the length property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setLength(BigInteger value) { + this.length = value; + } + + /** + * Gets the value of the mimeType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMimeType() { + return mimeType; + } + + /** + * Sets the value of the mimeType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMimeType(String value) { + this.mimeType = value; + } + + /** + * Gets the value of the filename property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFilename() { + return filename; + } + + /** + * Sets the value of the filename property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFilename(String value) { + this.filename = value; + } + + /** + * Gets the value of the uri property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUri() { + return uri; + } + + /** + * Sets the value of the uri property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUri(String value) { + this.uri = value; + } + + /** + * Gets the value of the stream property. + * + * @return + * possible object is + * {@link DataHandler } + * + */ + public DataHandler getStream() { + return stream; + } + + /** + * Sets the value of the stream property. + * + * @param value + * allowed object is + * {@link DataHandler } + * + */ + public void setStream(DataHandler value) { + this.stream = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateDocument.java b/source/generated/org/alfresco/repo/cmis/ws/CreateDocument.java index 28e006f8a8..a4ca57f6c7 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/CreateDocument.java +++ b/source/generated/org/alfresco/repo/cmis/ws/CreateDocument.java @@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID"/> - * <element name="propertyCollection" type="{http://www.cmis.org/ns/1.0}documentObjectType"/> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/> + * <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType"/> + * <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}contentStream" minOccurs="0"/> * <element name="versioningState" type="{http://www.cmis.org/ns/1.0}versioningStateEnum" minOccurs="0"/> * </sequence> @@ -35,8 +36,9 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "typeId", - "propertyCollection", + "properties", "folderId", "contentStream", "versioningState" @@ -44,17 +46,43 @@ import javax.xml.bind.annotation.XmlType; @XmlRootElement(name = "createDocument") public class CreateDocument { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String typeId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentObjectType propertyCollection; + protected PropertiesType properties; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String folderId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected ContentStream contentStream; + protected ContentStreamType contentStream; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected VersioningStateEnum versioningState; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the typeId property. * @@ -80,27 +108,27 @@ public class CreateDocument { } /** - * Gets the value of the propertyCollection property. + * Gets the value of the properties property. * * @return * possible object is - * {@link DocumentObjectType } + * {@link PropertiesType } * */ - public DocumentObjectType getPropertyCollection() { - return propertyCollection; + public PropertiesType getProperties() { + return properties; } /** - * Sets the value of the propertyCollection property. + * Sets the value of the properties property. * * @param value * allowed object is - * {@link DocumentObjectType } + * {@link PropertiesType } * */ - public void setPropertyCollection(DocumentObjectType value) { - this.propertyCollection = value; + public void setProperties(PropertiesType value) { + this.properties = value; } /** @@ -132,10 +160,10 @@ public class CreateDocument { * * @return * possible object is - * {@link ContentStream } + * {@link ContentStreamType } * */ - public ContentStream getContentStream() { + public ContentStreamType getContentStream() { return contentStream; } @@ -144,10 +172,10 @@ public class CreateDocument { * * @param value * allowed object is - * {@link ContentStream } + * {@link ContentStreamType } * */ - public void setContentStream(ContentStream value) { + public void setContentStream(ContentStreamType value) { this.contentStream = value; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateDocumentResponse.java b/source/generated/org/alfresco/repo/cmis/ws/CreateDocumentResponse.java index 565357c132..4d3c5561d7 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/CreateDocumentResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/CreateDocumentResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateFolder.java b/source/generated/org/alfresco/repo/cmis/ws/CreateFolder.java index 3e437a2261..72171c5f1b 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/CreateFolder.java +++ b/source/generated/org/alfresco/repo/cmis/ws/CreateFolder.java @@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID"/> - * <element name="propertyCollection" type="{http://www.cmis.org/ns/1.0}folderObjectType"/> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType"/> + * <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> @@ -33,20 +34,47 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "typeId", - "propertyCollection", + "properties", "folderId" }) @XmlRootElement(name = "createFolder") public class CreateFolder { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String typeId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected FolderObjectType propertyCollection; + protected PropertiesType properties; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String folderId; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the typeId property. * @@ -72,27 +100,27 @@ public class CreateFolder { } /** - * Gets the value of the propertyCollection property. + * Gets the value of the properties property. * * @return * possible object is - * {@link FolderObjectType } + * {@link PropertiesType } * */ - public FolderObjectType getPropertyCollection() { - return propertyCollection; + public PropertiesType getProperties() { + return properties; } /** - * Sets the value of the propertyCollection property. + * Sets the value of the properties property. * * @param value * allowed object is - * {@link FolderObjectType } + * {@link PropertiesType } * */ - public void setPropertyCollection(FolderObjectType value) { - this.propertyCollection = value; + public void setProperties(PropertiesType value) { + this.properties = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateFolderResponse.java b/source/generated/org/alfresco/repo/cmis/ws/CreateFolderResponse.java index f2df157015..95a06bc219 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/CreateFolderResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/CreateFolderResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreatePolicy.java b/source/generated/org/alfresco/repo/cmis/ws/CreatePolicy.java new file mode 100755 index 0000000000..1f4db49e68 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/CreatePolicy.java @@ -0,0 +1,150 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for createPolicy element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="createPolicy">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType"/>
+ *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "repositoryId", + "typeId", + "properties", + "folderId" +}) +@XmlRootElement(name = "createPolicy") +public class CreatePolicy { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String typeId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected PropertiesType properties; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String folderId; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the typeId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTypeId() { + return typeId; + } + + /** + * Sets the value of the typeId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTypeId(String value) { + this.typeId = value; + } + + /** + * Gets the value of the properties property. + * + * @return + * possible object is + * {@link PropertiesType } + * + */ + public PropertiesType getProperties() { + return properties; + } + + /** + * Sets the value of the properties property. + * + * @param value + * allowed object is + * {@link PropertiesType } + * + */ + public void setProperties(PropertiesType value) { + this.properties = value; + } + + /** + * Gets the value of the folderId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFolderId() { + return folderId; + } + + /** + * Sets the value of the folderId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFolderId(String value) { + this.folderId = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRootFolder.java b/source/generated/org/alfresco/repo/cmis/ws/CreatePolicyResponse.java old mode 100644 new mode 100755 similarity index 59% rename from source/generated/org/alfresco/repo/cmis/ws/GetRootFolder.java rename to source/generated/org/alfresco/repo/cmis/ws/CreatePolicyResponse.java index 5ab9b0ba82..0bd508d2de --- a/source/generated/org/alfresco/repo/cmis/ws/GetRootFolder.java +++ b/source/generated/org/alfresco/repo/cmis/ws/CreatePolicyResponse.java @@ -9,17 +9,17 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for getRootFolder element declaration. + *

Java class for createPolicyResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="getRootFolder">
+ * <element name="createPolicyResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "filter"
+    "objectId"
 })
-@XmlRootElement(name = "getRootFolder")
-public class GetRootFolder {
+@XmlRootElement(name = "createPolicyResponse")
+public class CreatePolicyResponse {
 
-    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
-    protected String filter;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
 
     /**
-     * Gets the value of the filter property.
+     * Gets the value of the objectId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getFilter() {
-        return filter;
+    public String getObjectId() {
+        return objectId;
     }
 
     /**
-     * Sets the value of the filter property.
+     * Sets the value of the objectId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setFilter(String value) {
-        this.filter = value;
+    public void setObjectId(String value) {
+        this.objectId = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateRelationship.java b/source/generated/org/alfresco/repo/cmis/ws/CreateRelationship.java
index 3c9e5213ab..272600fa4f 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CreateRelationship.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CreateRelationship.java
@@ -19,10 +19,11 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID"/>
- *           <element name="propertyCollection" type="{http://www.cmis.org/ns/1.0}relationshipObjectType"/>
- *           <element name="sourceObjectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
- *           <element name="targetObjectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType"/>
+ *           <element name="sourceObjectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="targetObjectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -34,23 +35,50 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "typeId",
-    "propertyCollection",
+    "properties",
     "sourceObjectId",
     "targetObjectId"
 })
 @XmlRootElement(name = "createRelationship")
 public class CreateRelationship {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String typeId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected RelationshipObjectType propertyCollection;
+    protected PropertiesType properties;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String sourceObjectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String targetObjectId;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the typeId property.
      * 
@@ -76,27 +104,27 @@ public class CreateRelationship {
     }
 
     /**
-     * Gets the value of the propertyCollection property.
+     * Gets the value of the properties property.
      * 
      * @return
      *     possible object is
-     *     {@link RelationshipObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public RelationshipObjectType getPropertyCollection() {
-        return propertyCollection;
+    public PropertiesType getProperties() {
+        return properties;
     }
 
     /**
-     * Sets the value of the propertyCollection property.
+     * Sets the value of the properties property.
      * 
      * @param value
      *     allowed object is
-     *     {@link RelationshipObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public void setPropertyCollection(RelationshipObjectType value) {
-        this.propertyCollection = value;
+    public void setProperties(PropertiesType value) {
+        this.properties = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/CreateRelationshipResponse.java b/source/generated/org/alfresco/repo/cmis/ws/CreateRelationshipResponse.java
index 1d332f4c22..fad62443bf 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/CreateRelationshipResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/CreateRelationshipResponse.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteAllVersions.java b/source/generated/org/alfresco/repo/cmis/ws/DeleteAllVersions.java
index 6025fcabf0..d72245707d 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/DeleteAllVersions.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/DeleteAllVersions.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="versionSeriesId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,36 +32,63 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "documentId"
+    "repositoryId",
+    "versionSeriesId"
 })
 @XmlRootElement(name = "deleteAllVersions")
 public class DeleteAllVersions {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected String documentId;
+    protected String repositoryId;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String versionSeriesId;
 
     /**
-     * Gets the value of the documentId property.
+     * Gets the value of the repositoryId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getDocumentId() {
-        return documentId;
+    public String getRepositoryId() {
+        return repositoryId;
     }
 
     /**
-     * Sets the value of the documentId property.
+     * Sets the value of the repositoryId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setDocumentId(String value) {
-        this.documentId = value;
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
+    /**
+     * Gets the value of the versionSeriesId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getVersionSeriesId() {
+        return versionSeriesId;
+    }
+
+    /**
+     * Sets the value of the versionSeriesId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVersionSeriesId(String value) {
+        this.versionSeriesId = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteContentStream.java b/source/generated/org/alfresco/repo/cmis/ws/DeleteContentStream.java
index 58dabdd5b8..b3aa3651ad 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/DeleteContentStream.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/DeleteContentStream.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,14 +32,41 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "documentId"
 })
 @XmlRootElement(name = "deleteContentStream")
 public class DeleteContentStream {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String documentId;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the documentId property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteObject.java b/source/generated/org/alfresco/repo/cmis/ws/DeleteObject.java
index 14158d3d8e..2e2db5f2ee 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/DeleteObject.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/DeleteObject.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,14 +32,41 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "objectId"
 })
 @XmlRootElement(name = "deleteObject")
 public class DeleteObject {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String objectId;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the objectId property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteTree.java b/source/generated/org/alfresco/repo/cmis/ws/DeleteTree.java
index 09edcf02b9..7485eaea57 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/DeleteTree.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/DeleteTree.java
@@ -19,8 +19,9 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/>
- *           <element name="unfileMultiFiledDocuments" type="{http://www.cmis.org/ns/1.0}deleteWithMultiFilingEnum"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="unfileNonfolderObjects" type="{http://www.cmis.org/ns/1.0}unfileNonfolderObjectsEnum"/>
  *           <element name="continueOnFailure" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         </sequence>
  *       </restriction>
@@ -33,20 +34,47 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "folderId",
-    "unfileMultiFiledDocuments",
+    "unfileNonfolderObjects",
     "continueOnFailure"
 })
 @XmlRootElement(name = "deleteTree")
 public class DeleteTree {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String folderId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected DeleteWithMultiFilingEnum unfileMultiFiledDocuments;
+    protected UnfileNonfolderObjectsEnum unfileNonfolderObjects;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected Boolean continueOnFailure;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the folderId property.
      * 
@@ -72,27 +100,27 @@ public class DeleteTree {
     }
 
     /**
-     * Gets the value of the unfileMultiFiledDocuments property.
+     * Gets the value of the unfileNonfolderObjects property.
      * 
      * @return
      *     possible object is
-     *     {@link DeleteWithMultiFilingEnum }
+     *     {@link UnfileNonfolderObjectsEnum }
      *     
      */
-    public DeleteWithMultiFilingEnum getUnfileMultiFiledDocuments() {
-        return unfileMultiFiledDocuments;
+    public UnfileNonfolderObjectsEnum getUnfileNonfolderObjects() {
+        return unfileNonfolderObjects;
     }
 
     /**
-     * Sets the value of the unfileMultiFiledDocuments property.
+     * Sets the value of the unfileNonfolderObjects property.
      * 
      * @param value
      *     allowed object is
-     *     {@link DeleteWithMultiFilingEnum }
+     *     {@link UnfileNonfolderObjectsEnum }
      *     
      */
-    public void setUnfileMultiFiledDocuments(DeleteWithMultiFilingEnum value) {
-        this.unfileMultiFiledDocuments = value;
+    public void setUnfileNonfolderObjects(UnfileNonfolderObjectsEnum value) {
+        this.unfileNonfolderObjects = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteTreeResponse.java b/source/generated/org/alfresco/repo/cmis/ws/DeleteTreeResponse.java
index ffb61fe4ce..9aad0958ac 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/DeleteTreeResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/DeleteTreeResponse.java
@@ -27,7 +27,7 @@ import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete;
  *               <complexContent>
  *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *                   <sequence>
- *                     <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID" maxOccurs="unbounded" minOccurs="0"/>
+ *                     <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID" maxOccurs="unbounded" minOccurs="0"/>
  *                   </sequence>
  *                 </restriction>
  *               </complexContent>
@@ -87,7 +87,7 @@ public class DeleteTreeResponse {
      *   <complexContent>
      *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
      *       <sequence>
-     *         <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID" maxOccurs="unbounded" minOccurs="0"/>
+     *         <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID" maxOccurs="unbounded" minOccurs="0"/>
      *       </sequence>
      *     </restriction>
      *   </complexContent>
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DiscoveryService.java b/source/generated/org/alfresco/repo/cmis/ws/DiscoveryService.java
new file mode 100755
index 0000000000..c3ed004d70
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/DiscoveryService.java
@@ -0,0 +1,58 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import org.alfresco.repo.cmis.ws.DiscoveryServicePort;
+
+/**
+ * This class was generated by Apache CXF 2.0.6
+ * Tue Jul 29 18:22:11 EEST 2008
+ * Generated source version: 2.0.6
+ * 
+ */
+
+@WebServiceClient(name = "DiscoveryService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/DiscoveryService.wsdl")
+public class DiscoveryService extends Service {
+
+    public final static URL WSDL_LOCATION;
+    public final static QName SERVICE = new QName("http://www.cmis.org/ns/1.0", "DiscoveryService");
+    public final static QName DiscoveryServicePort = new QName("http://www.cmis.org/ns/1.0", "DiscoveryServicePort");
+    static {
+        URL url = null;
+        try {
+            url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/DiscoveryService.wsdl");
+        } catch (MalformedURLException e) {
+            System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/DiscoveryService.wsdl");
+            // e.printStackTrace();
+        }
+        WSDL_LOCATION = url;
+    }
+
+    public DiscoveryService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
+    }
+
+    public DiscoveryService(URL wsdlLocation, QName serviceName) {
+        super(wsdlLocation, serviceName);
+    }
+
+    public DiscoveryService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+
+    /**
+     * 
+     * @return
+     *     returns DiscoveryServicePort
+     */
+    @WebEndpoint(name = "DiscoveryServicePort")
+    public DiscoveryServicePort getDiscoveryServicePort() {
+        return super.getPort(DiscoveryServicePort, DiscoveryServicePort.class);
+    }
+
+}
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DiscoveryServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/DiscoveryServicePort.java
new file mode 100755
index 0000000000..c6f06605e8
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/DiscoveryServicePort.java
@@ -0,0 +1,30 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+
+/**
+ * This class was generated by Apache CXF 2.0.6
+ * Tue Jul 29 18:22:11 EEST 2008
+ * Generated source version: 2.0.6
+ * 
+ */
+
+@WebService(targetNamespace = "http://www.cmis.org/ns/1.0", name = "DiscoveryServicePort")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+
+public interface DiscoveryServicePort {
+
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    @WebResult(name = "queryResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters")
+    @WebMethod
+    public org.alfresco.repo.cmis.ws.QueryResponse query(
+        @WebParam(partName = "parameters", name = "query", targetNamespace = "http://www.cmis.org/ns/1.0")
+        Query parameters
+    ) throws RuntimeException, InvalidArgumentException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+}
diff --git a/source/generated/org/alfresco/repo/cmis/ws/DocumentAndFolderCollection.java b/source/generated/org/alfresco/repo/cmis/ws/DocumentAndFolderCollection.java
deleted file mode 100644
index 252bfdbc7c..0000000000
--- a/source/generated/org/alfresco/repo/cmis/ws/DocumentAndFolderCollection.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package org.alfresco.repo.cmis.ws;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 

Java class for documentAndFolderCollection element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="documentAndFolderCollection">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}documentOrFolderObjectType" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "object" -}) -@XmlRootElement(name = "documentAndFolderCollection") -public class DocumentAndFolderCollection { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List object; - - /** - * Gets the value of the object property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the object property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getObject().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link DocumentOrFolderObjectType } - * - * - */ - public List getObject() { - if (object == null) { - object = new ArrayList(); - } - return this.object; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/DocumentFolderOrRelationshipObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/DocumentFolderOrRelationshipObjectType.java deleted file mode 100644 index 6f2f0d5a39..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/DocumentFolderOrRelationshipObjectType.java +++ /dev/null @@ -1,92 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for documentFolderOrRelationshipObjectType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="documentFolderOrRelationshipObjectType">
- *   <complexContent>
- *     <extension base="{http://www.cmis.org/ns/1.0}documentOrFolderObjectType">
- *       <sequence>
- *         <element ref="{http://www.cmis.org/ns/1.0}sourceOID" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}targetOID" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "documentFolderOrRelationshipObjectType", propOrder = { - "sourceOID", - "targetOID" -}) -public class DocumentFolderOrRelationshipObjectType - extends DocumentOrFolderObjectType -{ - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String sourceOID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String targetOID; - - /** - * Gets the value of the sourceOID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceOID() { - return sourceOID; - } - - /** - * Sets the value of the sourceOID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceOID(String value) { - this.sourceOID = value; - } - - /** - * Gets the value of the targetOID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetOID() { - return targetOID; - } - - /** - * Sets the value of the targetOID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetOID(String value) { - this.targetOID = value; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/DocumentObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/DocumentObjectType.java deleted file mode 100644 index 676572776f..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/DocumentObjectType.java +++ /dev/null @@ -1,436 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for documentObjectType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="documentObjectType">
- *   <complexContent>
- *     <extension base="{http://www.cmis.org/ns/1.0}objectTypeBase">
- *       <sequence>
- *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="isImmutable" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="isLatestVersion" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="isMajorVersion" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="isLatestMajorVersion" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="versionSeriesIsCheckedOut" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- *         <element name="versionSeriesCheckedOutBy" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="versionSeriesCheckedOutOID" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/>
- *         <element name="checkinComment" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="contentStreamLength" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         <element name="contentStreamMimeType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="contentStreamFilename" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="contentStreamURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}property" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "documentObjectType", propOrder = { - "name", - "isImmutable", - "isLatestVersion", - "isMajorVersion", - "isLatestMajorVersion", - "versionSeriesIsCheckedOut", - "versionSeriesCheckedOutBy", - "versionSeriesCheckedOutOID", - "checkinComment", - "contentStreamLength", - "contentStreamMimeType", - "contentStreamFilename", - "contentStreamURI", - "property" -}) -public class DocumentObjectType - extends ObjectTypeBase -{ - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String name; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean isImmutable; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean isLatestVersion; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean isMajorVersion; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean isLatestMajorVersion; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean versionSeriesIsCheckedOut; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String versionSeriesCheckedOutBy; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String versionSeriesCheckedOutOID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String checkinComment; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected BigInteger contentStreamLength; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String contentStreamMimeType; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String contentStreamFilename; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String contentStreamURI; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List property; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the isImmutable property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsImmutable() { - return isImmutable; - } - - /** - * Sets the value of the isImmutable property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsImmutable(Boolean value) { - this.isImmutable = value; - } - - /** - * Gets the value of the isLatestVersion property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsLatestVersion() { - return isLatestVersion; - } - - /** - * Sets the value of the isLatestVersion property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsLatestVersion(Boolean value) { - this.isLatestVersion = value; - } - - /** - * Gets the value of the isMajorVersion property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsMajorVersion() { - return isMajorVersion; - } - - /** - * Sets the value of the isMajorVersion property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsMajorVersion(Boolean value) { - this.isMajorVersion = value; - } - - /** - * Gets the value of the isLatestMajorVersion property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIsLatestMajorVersion() { - return isLatestMajorVersion; - } - - /** - * Sets the value of the isLatestMajorVersion property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIsLatestMajorVersion(Boolean value) { - this.isLatestMajorVersion = value; - } - - /** - * Gets the value of the versionSeriesIsCheckedOut property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isVersionSeriesIsCheckedOut() { - return versionSeriesIsCheckedOut; - } - - /** - * Sets the value of the versionSeriesIsCheckedOut property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setVersionSeriesIsCheckedOut(Boolean value) { - this.versionSeriesIsCheckedOut = value; - } - - /** - * Gets the value of the versionSeriesCheckedOutBy property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersionSeriesCheckedOutBy() { - return versionSeriesCheckedOutBy; - } - - /** - * Sets the value of the versionSeriesCheckedOutBy property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersionSeriesCheckedOutBy(String value) { - this.versionSeriesCheckedOutBy = value; - } - - /** - * Gets the value of the versionSeriesCheckedOutOID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersionSeriesCheckedOutOID() { - return versionSeriesCheckedOutOID; - } - - /** - * Sets the value of the versionSeriesCheckedOutOID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersionSeriesCheckedOutOID(String value) { - this.versionSeriesCheckedOutOID = value; - } - - /** - * Gets the value of the checkinComment property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCheckinComment() { - return checkinComment; - } - - /** - * Sets the value of the checkinComment property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCheckinComment(String value) { - this.checkinComment = value; - } - - /** - * Gets the value of the contentStreamLength property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getContentStreamLength() { - return contentStreamLength; - } - - /** - * Sets the value of the contentStreamLength property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setContentStreamLength(BigInteger value) { - this.contentStreamLength = value; - } - - /** - * Gets the value of the contentStreamMimeType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContentStreamMimeType() { - return contentStreamMimeType; - } - - /** - * Sets the value of the contentStreamMimeType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContentStreamMimeType(String value) { - this.contentStreamMimeType = value; - } - - /** - * Gets the value of the contentStreamFilename property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContentStreamFilename() { - return contentStreamFilename; - } - - /** - * Sets the value of the contentStreamFilename property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContentStreamFilename(String value) { - this.contentStreamFilename = value; - } - - /** - * Gets the value of the contentStreamURI property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getContentStreamURI() { - return contentStreamURI; - } - - /** - * Sets the value of the contentStreamURI property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setContentStreamURI(String value) { - this.contentStreamURI = value; - } - - /** - * Gets the value of the property property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the property property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getProperty().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Property } - * - * - */ - public List getProperty() { - if (property == null) { - property = new ArrayList(); - } - return this.property; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/DocumentOrFolderObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/DocumentOrFolderObjectType.java deleted file mode 100644 index 88ca50b437..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/DocumentOrFolderObjectType.java +++ /dev/null @@ -1,92 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for documentOrFolderObjectType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="documentOrFolderObjectType">
- *   <complexContent>
- *     <extension base="{http://www.cmis.org/ns/1.0}documentObjectType">
- *       <sequence>
- *         <element ref="{http://www.cmis.org/ns/1.0}parent" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}children" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "documentOrFolderObjectType", propOrder = { - "parent", - "children" -}) -public class DocumentOrFolderObjectType - extends DocumentObjectType -{ - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String parent; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Children children; - - /** - * Gets the value of the parent property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getParent() { - return parent; - } - - /** - * Sets the value of the parent property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setParent(String value) { - this.parent = value; - } - - /** - * Gets the value of the children property. - * - * @return - * possible object is - * {@link Children } - * - */ - public Children getChildren() { - return children; - } - - /** - * Sets the value of the children property. - * - * @param value - * allowed object is - * {@link Children } - * - */ - public void setChildren(Children value) { - this.children = value; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/FilterNotValidException.java b/source/generated/org/alfresco/repo/cmis/ws/FilterNotValidException.java index d1a25bfd08..1fc4213065 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/FilterNotValidException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/FilterNotValidException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "FilterNotValidFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "filterNotValidException", targetNamespace = "http://www.cmis.org/ns/1.0") public class FilterNotValidException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault filterNotValidFault; + private org.alfresco.repo.cmis.ws.BasicFault filterNotValidException; public FilterNotValidException() { super(); @@ -30,17 +30,17 @@ public class FilterNotValidException extends Exception { super(message, cause); } - public FilterNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault filterNotValidFault) { + public FilterNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault filterNotValidException) { super(message); - this.filterNotValidFault = filterNotValidFault; + this.filterNotValidException = filterNotValidException; } - public FilterNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault filterNotValidFault, Throwable cause) { + public FilterNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault filterNotValidException, Throwable cause) { super(message, cause); - this.filterNotValidFault = filterNotValidFault; + this.filterNotValidException = filterNotValidException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.filterNotValidFault; + return this.filterNotValidException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/FolderNotValidException.java b/source/generated/org/alfresco/repo/cmis/ws/FolderNotValidException.java index 5fdcd415bb..784ebc6c04 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/FolderNotValidException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/FolderNotValidException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:19 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "FolderNotValidFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "folderNotValidException", targetNamespace = "http://www.cmis.org/ns/1.0") public class FolderNotValidException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182219L; - private org.alfresco.repo.cmis.ws.BasicFault folderNotValidFault; + private org.alfresco.repo.cmis.ws.BasicFault folderNotValidException; public FolderNotValidException() { super(); @@ -30,17 +30,17 @@ public class FolderNotValidException extends Exception { super(message, cause); } - public FolderNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault folderNotValidFault) { + public FolderNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault folderNotValidException) { super(message); - this.folderNotValidFault = folderNotValidFault; + this.folderNotValidException = folderNotValidException; } - public FolderNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault folderNotValidFault, Throwable cause) { + public FolderNotValidException(String message, org.alfresco.repo.cmis.ws.BasicFault folderNotValidException, Throwable cause) { super(message, cause); - this.folderNotValidFault = folderNotValidFault; + this.folderNotValidException = folderNotValidException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.folderNotValidFault; + return this.folderNotValidException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/FolderObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/FolderObjectType.java deleted file mode 100644 index 0d80527810..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/FolderObjectType.java +++ /dev/null @@ -1,155 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for folderObjectType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="folderObjectType">
- *   <complexContent>
- *     <extension base="{http://www.cmis.org/ns/1.0}objectTypeBase">
- *       <sequence>
- *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}parent" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}children" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}property" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "folderObjectType", propOrder = { - "name", - "parent", - "children", - "property" -}) -public class FolderObjectType - extends ObjectTypeBase -{ - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String name; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String parent; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Children children; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List property; - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the parent property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getParent() { - return parent; - } - - /** - * Sets the value of the parent property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setParent(String value) { - this.parent = value; - } - - /** - * Gets the value of the children property. - * - * @return - * possible object is - * {@link Children } - * - */ - public Children getChildren() { - return children; - } - - /** - * Sets the value of the children property. - * - * @param value - * allowed object is - * {@link Children } - * - */ - public void setChildren(Children value) { - this.children = value; - } - - /** - * Gets the value of the property property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the property property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getProperty().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Property } - * - * - */ - public List getProperty() { - if (property == null) { - property = new ArrayList(); - } - return this.property; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/FolderTreeType.java b/source/generated/org/alfresco/repo/cmis/ws/FolderTreeType.java new file mode 100755 index 0000000000..f9af53353f --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/FolderTreeType.java @@ -0,0 +1,64 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for folderTreeType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="folderTreeType">
+ *   <complexContent>
+ *     <extension base="{http://www.cmis.org/ns/1.0}objectType">
+ *       <sequence>
+ *         <element name="children" type="{http://www.cmis.org/ns/1.0}childrenType" minOccurs="0"/>
+ *       </sequence>
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "folderTreeType", propOrder = { + "children" +}) +public class FolderTreeType + extends ObjectType +{ + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected ChildrenType children; + + /** + * Gets the value of the children property. + * + * @return + * possible object is + * {@link ChildrenType } + * + */ + public ChildrenType getChildren() { + return children; + } + + /** + * Sets the value of the children property. + * + * @param value + * allowed object is + * {@link ChildrenType } + * + */ + public void setChildren(ChildrenType value) { + this.children = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/FulltextEnum.java b/source/generated/org/alfresco/repo/cmis/ws/FulltextEnum.java new file mode 100755 index 0000000000..fb45cb4043 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/FulltextEnum.java @@ -0,0 +1,52 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; + + +/** + *

Java class for fulltextEnum. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+ * <simpleType name="fulltextEnum">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="noFulltext"/>
+ *     <enumeration value="fulltextOnly"/>
+ *     <enumeration value="fulltextAndStructured"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlEnum +public enum FulltextEnum { + + @XmlEnumValue("fulltextAndStructured") + FULLTEXT_AND_STRUCTURED("fulltextAndStructured"), + @XmlEnumValue("fulltextOnly") + FULLTEXT_ONLY("fulltextOnly"), + @XmlEnumValue("noFulltext") + NO_FULLTEXT("noFulltext"); + private final String value; + + FulltextEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + public static FulltextEnum fromValue(String v) { + for (FulltextEnum c: FulltextEnum.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v.toString()); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetAllVersions.java b/source/generated/org/alfresco/repo/cmis/ws/GetAllVersions.java index 6048643cce..4b23145980 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetAllVersions.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetAllVersions.java @@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="versionSeriesId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/> * </sequence> * </restriction> @@ -32,39 +33,66 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentId", + "repositoryId", + "versionSeriesId", "filter" }) @XmlRootElement(name = "getAllVersions") public class GetAllVersions { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String documentId; + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String versionSeriesId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String filter; /** - * Gets the value of the documentId property. + * Gets the value of the repositoryId property. * * @return * possible object is * {@link String } * */ - public String getDocumentId() { - return documentId; + public String getRepositoryId() { + return repositoryId; } /** - * Sets the value of the documentId property. + * Sets the value of the repositoryId property. * * @param value * allowed object is * {@link String } * */ - public void setDocumentId(String value) { - this.documentId = value; + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the versionSeriesId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersionSeriesId() { + return versionSeriesId; + } + + /** + * Sets the value of the versionSeriesId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersionSeriesId(String value) { + this.versionSeriesId = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetAllVersionsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetAllVersionsResponse.java index 06a2a84145..0c6033f9dd 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetAllVersionsResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetAllVersionsResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}documentCollection"/> + * <element name="versions" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/> * </sequence> * </restriction> * </complexContent> @@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentCollection" + "versions" }) @XmlRootElement(name = "getAllVersionsResponse") public class GetAllVersionsResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentCollection documentCollection; + protected ObjectCollectionType versions; /** - * Gets the value of the documentCollection property. + * Gets the value of the versions property. * * @return * possible object is - * {@link DocumentCollection } + * {@link ObjectCollectionType } * */ - public DocumentCollection getDocumentCollection() { - return documentCollection; + public ObjectCollectionType getVersions() { + return versions; } /** - * Sets the value of the documentCollection property. + * Sets the value of the versions property. * * @param value * allowed object is - * {@link DocumentCollection } + * {@link ObjectCollectionType } * */ - public void setDocumentCollection(DocumentCollection value) { - this.documentCollection = value; + public void setVersions(ObjectCollectionType value) { + this.versions = value; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActions.java b/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActions.java index e1480768b3..5a246c4516 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActions.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActions.java @@ -19,8 +19,9 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="asUser" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="asUser" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -32,6 +33,7 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "objectId", "asUser" }) @@ -39,10 +41,36 @@ import javax.xml.bind.annotation.XmlType; public class GetAllowableActions { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String objectId; + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String objectId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String asUser; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the objectId property. * diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActionsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActionsResponse.java index 78f96871b2..1525f7717f 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActionsResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetAllowableActionsResponse.java @@ -1,14 +1,11 @@ package org.alfresco.repo.cmis.ws; -import java.util.ArrayList; -import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionCollection; /** @@ -22,17 +19,7 @@ import org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionColl * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="allowableActionCollection"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="action" type="{http://www.cmis.org/ns/1.0}allowableActionsEnum" maxOccurs="unbounded" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <element name="allowableActions" type="{http://www.cmis.org/ns/1.0}allowableActionsType"/> * </sequence> * </restriction> * </complexContent> @@ -44,96 +31,36 @@ import org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionColl */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "allowableActionCollection" + "allowableActions" }) @XmlRootElement(name = "getAllowableActionsResponse") public class GetAllowableActionsResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected AllowableActionCollection allowableActionCollection; + protected AllowableActionsType allowableActions; /** - * Gets the value of the allowableActionCollection property. + * Gets the value of the allowableActions property. * * @return * possible object is - * {@link AllowableActionCollection } + * {@link AllowableActionsType } * */ - public AllowableActionCollection getAllowableActionCollection() { - return allowableActionCollection; + public AllowableActionsType getAllowableActions() { + return allowableActions; } /** - * Sets the value of the allowableActionCollection property. + * Sets the value of the allowableActions property. * * @param value * allowed object is - * {@link AllowableActionCollection } + * {@link AllowableActionsType } * */ - public void setAllowableActionCollection(AllowableActionCollection value) { - this.allowableActionCollection = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="action" type="{http://www.cmis.org/ns/1.0}allowableActionsEnum" maxOccurs="unbounded" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "action" - }) - public static class AllowableActionCollection { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List action; - - /** - * Gets the value of the action property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the action property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getAction().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link AllowableActionsEnum } - * - * - */ - public List getAction() { - if (action == null) { - action = new ArrayList(); - } - return this.action; - } - + public void setAllowableActions(AllowableActionsType value) { + this.allowableActions = value; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetDocumentParents.java b/source/generated/org/alfresco/repo/cmis/ws/GetAppliedPolicies.java old mode 100644 new mode 100755 similarity index 55% rename from source/generated/org/alfresco/repo/cmis/ws/GetDocumentParents.java rename to source/generated/org/alfresco/repo/cmis/ws/GetAppliedPolicies.java index 95d8608951..bc7a841c20 --- a/source/generated/org/alfresco/repo/cmis/ws/GetDocumentParents.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetAppliedPolicies.java @@ -9,17 +9,18 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for getDocumentParents element declaration. + *

Java class for getAppliedPolicies element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="getDocumentParents">
+ * <element name="getAppliedPolicies">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
  *         </sequence>
  *       </restriction>
@@ -32,39 +33,66 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "documentId",
+    "repositoryId",
+    "objectId",
     "filter"
 })
-@XmlRootElement(name = "getDocumentParents")
-public class GetDocumentParents {
+@XmlRootElement(name = "getAppliedPolicies")
+public class GetAppliedPolicies {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected String documentId;
+    protected String repositoryId;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String filter;
 
     /**
-     * Gets the value of the documentId property.
+     * Gets the value of the repositoryId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getDocumentId() {
-        return documentId;
+    public String getRepositoryId() {
+        return repositoryId;
     }
 
     /**
-     * Sets the value of the documentId property.
+     * Sets the value of the repositoryId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setDocumentId(String value) {
-        this.documentId = value;
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
+    /**
+     * Gets the value of the objectId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * Sets the value of the objectId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setObjectId(String value) {
+        this.objectId = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetAppliedPoliciesResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetAppliedPoliciesResponse.java
new file mode 100755
index 0000000000..2d958df223
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetAppliedPoliciesResponse.java
@@ -0,0 +1,66 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 

Java class for getAppliedPoliciesResponse element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="getAppliedPoliciesResponse">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="appliedPolicies" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "appliedPolicies" +}) +@XmlRootElement(name = "getAppliedPoliciesResponse") +public class GetAppliedPoliciesResponse { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected ObjectCollectionType appliedPolicies; + + /** + * Gets the value of the appliedPolicies property. + * + * @return + * possible object is + * {@link ObjectCollectionType } + * + */ + public ObjectCollectionType getAppliedPolicies() { + return appliedPolicies; + } + + /** + * Sets the value of the appliedPolicies property. + * + * @param value + * allowed object is + * {@link ObjectCollectionType } + * + */ + public void setAppliedPolicies(ObjectCollectionType value) { + this.appliedPolicies = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocs.java b/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocs.java index 7c5607e693..a4310eff48 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocs.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocs.java @@ -20,10 +20,12 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="folderID" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/> + * <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}maxItems" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}skipCount" minOccurs="0"/> - * <element name="folderID" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -35,22 +37,76 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", + "folderID", "filter", + "includeAllowableActions", "maxItems", - "skipCount", - "folderID" + "skipCount" }) @XmlRootElement(name = "getCheckedoutDocs") public class GetCheckedoutDocs { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String folderID; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String filter; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger maxItems; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger skipCount; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String folderID; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the folderID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFolderID() { + return folderID; + } + + /** + * Sets the value of the folderID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFolderID(String value) { + this.folderID = value; + } /** * Gets the value of the filter property. @@ -76,6 +132,30 @@ public class GetCheckedoutDocs { this.filter = value; } + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + /** * Gets the value of the maxItems property. * @@ -124,28 +204,4 @@ public class GetCheckedoutDocs { this.skipCount = value; } - /** - * Gets the value of the folderID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFolderID() { - return folderID; - } - - /** - * Sets the value of the folderID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFolderID(String value) { - this.folderID = value; - } - } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocsResponse.java index f41a570226..2e69adf2e5 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocsResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetCheckedoutDocsResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}documentCollection"/> + * <element name="documents" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/> * <element ref="{http://www.cmis.org/ns/1.0}hasMoreItems"/> * </sequence> * </restriction> @@ -32,39 +32,39 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentCollection", + "documents", "hasMoreItems" }) @XmlRootElement(name = "getCheckedoutDocsResponse") public class GetCheckedoutDocsResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentCollection documentCollection; + protected ObjectCollectionType documents; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected boolean hasMoreItems; /** - * Gets the value of the documentCollection property. + * Gets the value of the documents property. * * @return * possible object is - * {@link DocumentCollection } + * {@link ObjectCollectionType } * */ - public DocumentCollection getDocumentCollection() { - return documentCollection; + public ObjectCollectionType getDocuments() { + return documents; } /** - * Sets the value of the documentCollection property. + * Sets the value of the documents property. * * @param value * allowed object is - * {@link DocumentCollection } + * {@link ObjectCollectionType } * */ - public void setDocumentCollection(DocumentCollection value) { - this.documentCollection = value; + public void setDocuments(ObjectCollectionType value) { + this.documents = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetChildren.java b/source/generated/org/alfresco/repo/cmis/ws/GetChildren.java index 3e9dd73aff..f772d22432 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetChildren.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetChildren.java @@ -20,9 +20,11 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="type" type="{http://www.cmis.org/ns/1.0}typesOfObjectsEnum"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="type" type="{http://www.cmis.org/ns/1.0}typesOfFileableObjectsEnum" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/> + * <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}maxItems" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}skipCount" minOccurs="0"/> * </sequence> @@ -36,9 +38,11 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "folderId", "type", "filter", + "includeAllowableActions", "maxItems", "skipCount" }) @@ -46,16 +50,44 @@ import javax.xml.bind.annotation.XmlType; public class GetChildren { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String folderId; + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected TypesOfObjectsEnum type; + protected String folderId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected TypesOfFileableObjectsEnum type; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String filter; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger maxItems; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger skipCount; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the folderId property. * @@ -85,10 +117,10 @@ public class GetChildren { * * @return * possible object is - * {@link TypesOfObjectsEnum } + * {@link TypesOfFileableObjectsEnum } * */ - public TypesOfObjectsEnum getType() { + public TypesOfFileableObjectsEnum getType() { return type; } @@ -97,10 +129,10 @@ public class GetChildren { * * @param value * allowed object is - * {@link TypesOfObjectsEnum } + * {@link TypesOfFileableObjectsEnum } * */ - public void setType(TypesOfObjectsEnum value) { + public void setType(TypesOfFileableObjectsEnum value) { this.type = value; } @@ -128,6 +160,30 @@ public class GetChildren { this.filter = value; } + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + /** * Gets the value of the maxItems property. * diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetChildrenResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetChildrenResponse.java index f6ef9690c4..f15e557a92 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetChildrenResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetChildrenResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}documentAndFolderCollection"/> + * <element name="children" type="{http://www.cmis.org/ns/1.0}childrenType"/> * <element ref="{http://www.cmis.org/ns/1.0}hasMoreItems"/> * </sequence> * </restriction> @@ -32,39 +32,39 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentAndFolderCollection", + "children", "hasMoreItems" }) @XmlRootElement(name = "getChildrenResponse") public class GetChildrenResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentAndFolderCollection documentAndFolderCollection; + protected ChildrenType children; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected boolean hasMoreItems; /** - * Gets the value of the documentAndFolderCollection property. + * Gets the value of the children property. * * @return * possible object is - * {@link DocumentAndFolderCollection } + * {@link ChildrenType } * */ - public DocumentAndFolderCollection getDocumentAndFolderCollection() { - return documentAndFolderCollection; + public ChildrenType getChildren() { + return children; } /** - * Sets the value of the documentAndFolderCollection property. + * Sets the value of the children property. * * @param value * allowed object is - * {@link DocumentAndFolderCollection } + * {@link ChildrenType } * */ - public void setDocumentAndFolderCollection(DocumentAndFolderCollection value) { - this.documentAndFolderCollection = value; + public void setChildren(ChildrenType value) { + this.children = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetContentStream.java b/source/generated/org/alfresco/repo/cmis/ws/GetContentStream.java index d3a059fd94..1f6c5ceeae 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetContentStream.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetContentStream.java @@ -1,7 +1,6 @@ package org.alfresco.repo.cmis.ws; -import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -20,9 +19,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="offset" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/> - * <element name="length" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> @@ -34,19 +32,40 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentId", - "offset", - "length" + "repositoryId", + "documentId" }) @XmlRootElement(name = "getContentStream") public class GetContentStream { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String documentId; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected BigInteger offset; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected BigInteger length; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } /** * Gets the value of the documentId property. @@ -72,52 +91,4 @@ public class GetContentStream { this.documentId = value; } - /** - * Gets the value of the offset property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getOffset() { - return offset; - } - - /** - * Sets the value of the offset property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setOffset(BigInteger value) { - this.offset = value; - } - - /** - * Gets the value of the length property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getLength() { - return length; - } - - /** - * Sets the value of the length property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setLength(BigInteger value) { - this.length = value; - } - } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetContentStreamResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetContentStreamResponse.java index f7c2addfda..7c1b671039 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetContentStreamResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetContentStreamResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="stream" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/> + * <element ref="{http://www.cmis.org/ns/1.0}contentStream"/> * </sequence> * </restriction> * </complexContent> @@ -31,34 +31,36 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "stream" + "contentStream" }) @XmlRootElement(name = "getContentStreamResponse") public class GetContentStreamResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected byte[] stream; + protected ContentStreamType contentStream; /** - * Gets the value of the stream property. + * Gets the value of the contentStream property. * * @return * possible object is - * byte[] + * {@link ContentStreamType } + * */ - public byte[] getStream() { - return stream; + public ContentStreamType getContentStream() { + return contentStream; } /** - * Sets the value of the stream property. + * Sets the value of the contentStream property. * * @param value * allowed object is - * byte[] + * {@link ContentStreamType } + * */ - public void setStream(byte[] value) { - this.stream = ((byte[]) value); + public void setContentStream(ContentStreamType value) { + this.contentStream = value; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetDescendants.java b/source/generated/org/alfresco/repo/cmis/ws/GetDescendants.java index 210a0dc99a..1114a19386 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetDescendants.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetDescendants.java @@ -1,6 +1,7 @@ package org.alfresco.repo.cmis.ws; +import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -19,10 +20,12 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="type" type="{http://www.cmis.org/ns/1.0}typesOfObjectsEnum"/> - * <element name="depth" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="type" type="{http://www.cmis.org/ns/1.0}typesOfFileableObjectsEnum" minOccurs="0"/> + * <element name="depth" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/> + * <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -34,22 +37,52 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "folderId", "type", "depth", - "filter" + "filter", + "includeAllowableActions" }) @XmlRootElement(name = "getDescendants") public class GetDescendants { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String folderId; + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected TypesOfObjectsEnum type; + protected String folderId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Object depth; + protected TypesOfFileableObjectsEnum type; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected BigInteger depth; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String filter; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } /** * Gets the value of the folderId property. @@ -80,10 +113,10 @@ public class GetDescendants { * * @return * possible object is - * {@link TypesOfObjectsEnum } + * {@link TypesOfFileableObjectsEnum } * */ - public TypesOfObjectsEnum getType() { + public TypesOfFileableObjectsEnum getType() { return type; } @@ -92,10 +125,10 @@ public class GetDescendants { * * @param value * allowed object is - * {@link TypesOfObjectsEnum } + * {@link TypesOfFileableObjectsEnum } * */ - public void setType(TypesOfObjectsEnum value) { + public void setType(TypesOfFileableObjectsEnum value) { this.type = value; } @@ -104,10 +137,10 @@ public class GetDescendants { * * @return * possible object is - * {@link Object } + * {@link BigInteger } * */ - public Object getDepth() { + public BigInteger getDepth() { return depth; } @@ -116,10 +149,10 @@ public class GetDescendants { * * @param value * allowed object is - * {@link Object } + * {@link BigInteger } * */ - public void setDepth(Object value) { + public void setDepth(BigInteger value) { this.depth = value; } @@ -147,4 +180,28 @@ public class GetDescendants { this.filter = value; } + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetDescendantsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetDescendantsResponse.java index 537c7a2b2a..f21a55f59a 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetDescendantsResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetDescendantsResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}documentAndFolderCollection"/> + * <element name="descendants" type="{http://www.cmis.org/ns/1.0}childrenType"/> * </sequence> * </restriction> * </complexContent> @@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentAndFolderCollection" + "descendants" }) @XmlRootElement(name = "getDescendantsResponse") public class GetDescendantsResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentAndFolderCollection documentAndFolderCollection; + protected ChildrenType descendants; /** - * Gets the value of the documentAndFolderCollection property. + * Gets the value of the descendants property. * * @return * possible object is - * {@link DocumentAndFolderCollection } + * {@link ChildrenType } * */ - public DocumentAndFolderCollection getDocumentAndFolderCollection() { - return documentAndFolderCollection; + public ChildrenType getDescendants() { + return descendants; } /** - * Sets the value of the documentAndFolderCollection property. + * Sets the value of the descendants property. * * @param value * allowed object is - * {@link DocumentAndFolderCollection } + * {@link ChildrenType } * */ - public void setDocumentAndFolderCollection(DocumentAndFolderCollection value) { - this.documentAndFolderCollection = value; + public void setDescendants(ChildrenType value) { + this.descendants = value; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetFolderParent.java b/source/generated/org/alfresco/repo/cmis/ws/GetFolderParent.java index af53b08fe4..29cc97ba95 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetFolderParent.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetFolderParent.java @@ -19,8 +19,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/> + * <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="returnToRoot" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </sequence> * </restriction> @@ -33,20 +35,50 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "folderId", "filter", + "includeAllowableActions", "returnToRoot" }) @XmlRootElement(name = "getFolderParent") public class GetFolderParent { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String folderId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String filter; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected Boolean returnToRoot; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the folderId property. * @@ -95,6 +127,30 @@ public class GetFolderParent { this.filter = value; } + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + /** * Gets the value of the returnToRoot property. * diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetFolderParentResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetFolderParentResponse.java index 992ccd263d..ab8e417e81 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetFolderParentResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetFolderParentResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}folderCollection"/> + * <element name="ancestors" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/> * </sequence> * </restriction> * </complexContent> @@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "folderCollection" + "ancestors" }) @XmlRootElement(name = "getFolderParentResponse") public class GetFolderParentResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected FolderCollection folderCollection; + protected ObjectCollectionType ancestors; /** - * Gets the value of the folderCollection property. + * Gets the value of the ancestors property. * * @return * possible object is - * {@link FolderCollection } + * {@link ObjectCollectionType } * */ - public FolderCollection getFolderCollection() { - return folderCollection; + public ObjectCollectionType getAncestors() { + return ancestors; } /** - * Sets the value of the folderCollection property. + * Sets the value of the ancestors property. * * @param value * allowed object is - * {@link FolderCollection } + * {@link ObjectCollectionType } * */ - public void setFolderCollection(FolderCollection value) { - this.folderCollection = value; + public void setAncestors(ObjectCollectionType value) { + this.ancestors = value; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetObjectParents.java b/source/generated/org/alfresco/repo/cmis/ws/GetObjectParents.java new file mode 100755 index 0000000000..d3ba9d83e6 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/GetObjectParents.java @@ -0,0 +1,150 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for getObjectParents element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="getObjectParents">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
+ *           <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "repositoryId", + "objectId", + "filter", + "includeAllowableActions" +}) +@XmlRootElement(name = "getObjectParents") +public class GetObjectParents { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String objectId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String filter; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the objectId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getObjectId() { + return objectId; + } + + /** + * Sets the value of the objectId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setObjectId(String value) { + this.objectId = value; + } + + /** + * Gets the value of the filter property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFilter() { + return filter; + } + + /** + * Sets the value of the filter property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFilter(String value) { + this.filter = value; + } + + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetDocumentParentsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetObjectParentsResponse.java old mode 100644 new mode 100755 similarity index 55% rename from source/generated/org/alfresco/repo/cmis/ws/GetDocumentParentsResponse.java rename to source/generated/org/alfresco/repo/cmis/ws/GetObjectParentsResponse.java index c5829f7c6a..a1c0a2af1b --- a/source/generated/org/alfresco/repo/cmis/ws/GetDocumentParentsResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetObjectParentsResponse.java @@ -9,17 +9,17 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for getDocumentParentsResponse element declaration. + *

Java class for getObjectParentsResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="getDocumentParentsResponse">
+ * <element name="getObjectParentsResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element ref="{http://www.cmis.org/ns/1.0}folderCollection"/>
+ *           <element name="parents" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "folderCollection"
+    "parents"
 })
-@XmlRootElement(name = "getDocumentParentsResponse")
-public class GetDocumentParentsResponse {
+@XmlRootElement(name = "getObjectParentsResponse")
+public class GetObjectParentsResponse {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected FolderCollection folderCollection;
+    protected ObjectCollectionType parents;
 
     /**
-     * Gets the value of the folderCollection property.
+     * Gets the value of the parents property.
      * 
      * @return
      *     possible object is
-     *     {@link FolderCollection }
+     *     {@link ObjectCollectionType }
      *     
      */
-    public FolderCollection getFolderCollection() {
-        return folderCollection;
+    public ObjectCollectionType getParents() {
+        return parents;
     }
 
     /**
-     * Sets the value of the folderCollection property.
+     * Sets the value of the parents property.
      * 
      * @param value
      *     allowed object is
-     *     {@link FolderCollection }
+     *     {@link ObjectCollectionType }
      *     
      */
-    public void setFolderCollection(FolderCollection value) {
-        this.folderCollection = value;
+    public void setParents(ObjectCollectionType value) {
+        this.parents = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetProperties.java b/source/generated/org/alfresco/repo/cmis/ws/GetProperties.java
index 8d47a79a2c..2552ea2509 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/GetProperties.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetProperties.java
@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element name="returnVersion" type="{http://www.cmis.org/ns/1.0}versionEnum" minOccurs="0"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
  *         </sequence>
@@ -33,6 +34,7 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "objectId",
     "returnVersion",
     "filter"
@@ -40,6 +42,8 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "getProperties")
 public class GetProperties {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String objectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
@@ -47,6 +51,30 @@ public class GetProperties {
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String filter;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the objectId property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersion.java b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersion.java
new file mode 100755
index 0000000000..ffd80c3986
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersion.java
@@ -0,0 +1,150 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 

Java class for getPropertiesOfLatestVersion element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="getPropertiesOfLatestVersion">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="versionSeriesId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="majorVersion" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "repositoryId", + "versionSeriesId", + "majorVersion", + "filter" +}) +@XmlRootElement(name = "getPropertiesOfLatestVersion") +public class GetPropertiesOfLatestVersion { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String versionSeriesId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean majorVersion; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String filter; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the versionSeriesId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getVersionSeriesId() { + return versionSeriesId; + } + + /** + * Sets the value of the versionSeriesId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setVersionSeriesId(String value) { + this.versionSeriesId = value; + } + + /** + * Gets the value of the majorVersion property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isMajorVersion() { + return majorVersion; + } + + /** + * Sets the value of the majorVersion property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setMajorVersion(Boolean value) { + this.majorVersion = value; + } + + /** + * Gets the value of the filter property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFilter() { + return filter; + } + + /** + * Sets the value of the filter property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFilter(String value) { + this.filter = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRootFolderResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersionResponse.java old mode 100644 new mode 100755 similarity index 57% rename from source/generated/org/alfresco/repo/cmis/ws/GetRootFolderResponse.java rename to source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersionResponse.java index 563ceea6a7..7200dc14ee --- a/source/generated/org/alfresco/repo/cmis/ws/GetRootFolderResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesOfLatestVersionResponse.java @@ -9,17 +9,17 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for getRootFolderResponse element declaration. + *

Java class for getPropertiesOfLatestVersionResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="getRootFolderResponse">
+ * <element name="getPropertiesOfLatestVersionResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="rootFolder" type="{http://www.cmis.org/ns/1.0}folderObjectType"/>
+ *           <element name="object" type="{http://www.cmis.org/ns/1.0}objectType"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -31,36 +31,36 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "rootFolder"
+    "object"
 })
-@XmlRootElement(name = "getRootFolderResponse")
-public class GetRootFolderResponse {
+@XmlRootElement(name = "getPropertiesOfLatestVersionResponse")
+public class GetPropertiesOfLatestVersionResponse {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected FolderObjectType rootFolder;
+    protected ObjectType object;
 
     /**
-     * Gets the value of the rootFolder property.
+     * Gets the value of the object property.
      * 
      * @return
      *     possible object is
-     *     {@link FolderObjectType }
+     *     {@link ObjectType }
      *     
      */
-    public FolderObjectType getRootFolder() {
-        return rootFolder;
+    public ObjectType getObject() {
+        return object;
     }
 
     /**
-     * Sets the value of the rootFolder property.
+     * Sets the value of the object property.
      * 
      * @param value
      *     allowed object is
-     *     {@link FolderObjectType }
+     *     {@link ObjectType }
      *     
      */
-    public void setRootFolder(FolderObjectType value) {
-        this.rootFolder = value;
+    public void setObject(ObjectType value) {
+        this.object = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesResponse.java
index df85015391..4f18c62798 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetPropertiesResponse.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}documentFolderOrRelationshipObjectType"/>
+ *           <element name="object" type="{http://www.cmis.org/ns/1.0}objectType"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -37,17 +37,17 @@ import javax.xml.bind.annotation.XmlType;
 public class GetPropertiesResponse {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected DocumentFolderOrRelationshipObjectType object;
+    protected ObjectType object;
 
     /**
      * Gets the value of the object property.
      * 
      * @return
      *     possible object is
-     *     {@link DocumentFolderOrRelationshipObjectType }
+     *     {@link ObjectType }
      *     
      */
-    public DocumentFolderOrRelationshipObjectType getObject() {
+    public ObjectType getObject() {
         return object;
     }
 
@@ -56,10 +56,10 @@ public class GetPropertiesResponse {
      * 
      * @param value
      *     allowed object is
-     *     {@link DocumentFolderOrRelationshipObjectType }
+     *     {@link ObjectType }
      *     
      */
-    public void setObject(DocumentFolderOrRelationshipObjectType value) {
+    public void setObject(ObjectType value) {
         this.object = value;
     }
 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRelationships.java b/source/generated/org/alfresco/repo/cmis/ws/GetRelationships.java
index d2e87fd3d8..4dea1d4c85 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/GetRelationships.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetRelationships.java
@@ -20,11 +20,13 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
- *           <element name="direction" type="{http://www.cmis.org/ns/1.0}relationshipDirectionEnum"/>
- *           <element name="typeId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="direction" type="{http://www.cmis.org/ns/1.0}relationshipDirectionEnum" minOccurs="0"/>
+ *           <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/>
  *           <element name="includeSubRelationshipTypes" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
+ *           <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}maxItems" minOccurs="0"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}skipCount" minOccurs="0"/>
  *         </sequence>
@@ -38,11 +40,13 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "objectId",
     "direction",
     "typeId",
     "includeSubRelationshipTypes",
     "filter",
+    "includeAllowableActions",
     "maxItems",
     "skipCount"
 })
@@ -50,8 +54,10 @@ import javax.xml.bind.annotation.XmlType;
 public class GetRelationships {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected String objectId;
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected RelationshipDirectionEnum direction;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String typeId;
@@ -60,10 +66,36 @@ public class GetRelationships {
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String filter;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
+    protected Boolean includeAllowableActions;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected BigInteger maxItems;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected BigInteger skipCount;
 
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
     /**
      * Gets the value of the objectId property.
      * 
@@ -184,6 +216,30 @@ public class GetRelationships {
         this.filter = value;
     }
 
+    /**
+     * Gets the value of the includeAllowableActions property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Boolean }
+     *     
+     */
+    public Boolean isIncludeAllowableActions() {
+        return includeAllowableActions;
+    }
+
+    /**
+     * Sets the value of the includeAllowableActions property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Boolean }
+     *     
+     */
+    public void setIncludeAllowableActions(Boolean value) {
+        this.includeAllowableActions = value;
+    }
+
     /**
      * Gets the value of the maxItems property.
      * 
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRelationshipsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetRelationshipsResponse.java
index 2a7120d351..4ca0f701e6 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/GetRelationshipsResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetRelationshipsResponse.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element ref="{http://www.cmis.org/ns/1.0}relationshipCollection"/>
+ *           <element name="relationships" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/>
  *           <element ref="{http://www.cmis.org/ns/1.0}hasMoreItems"/>
  *         </sequence>
  *       </restriction>
@@ -32,39 +32,39 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "relationshipCollection",
+    "relationships",
     "hasMoreItems"
 })
 @XmlRootElement(name = "getRelationshipsResponse")
 public class GetRelationshipsResponse {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected RelationshipCollection relationshipCollection;
+    protected ObjectCollectionType relationships;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected boolean hasMoreItems;
 
     /**
-     * Gets the value of the relationshipCollection property.
+     * Gets the value of the relationships property.
      * 
      * @return
      *     possible object is
-     *     {@link RelationshipCollection }
+     *     {@link ObjectCollectionType }
      *     
      */
-    public RelationshipCollection getRelationshipCollection() {
-        return relationshipCollection;
+    public ObjectCollectionType getRelationships() {
+        return relationships;
     }
 
     /**
-     * Sets the value of the relationshipCollection property.
+     * Sets the value of the relationships property.
      * 
      * @param value
      *     allowed object is
-     *     {@link RelationshipCollection }
+     *     {@link ObjectCollectionType }
      *     
      */
-    public void setRelationshipCollection(RelationshipCollection value) {
-        this.relationshipCollection = value;
+    public void setRelationships(ObjectCollectionType value) {
+        this.relationships = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRepositories.java b/source/generated/org/alfresco/repo/cmis/ws/GetRepositories.java
new file mode 100755
index 0000000000..fd058f1761
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/GetRepositories.java
@@ -0,0 +1,36 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 

Java class for getRepositories element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="getRepositories">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "getRepositories") +public class GetRepositories { + + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/DocumentCollection.java b/source/generated/org/alfresco/repo/cmis/ws/GetRepositoriesResponse.java old mode 100644 new mode 100755 similarity index 64% rename from source/generated/org/alfresco/repo/cmis/ws/DocumentCollection.java rename to source/generated/org/alfresco/repo/cmis/ws/GetRepositoriesResponse.java index e446497a0a..ba48ffa1f2 --- a/source/generated/org/alfresco/repo/cmis/ws/DocumentCollection.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetRepositoriesResponse.java @@ -11,17 +11,17 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for documentCollection element declaration. + *

Java class for getRepositoriesResponse element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="documentCollection">
+ * <element name="getRepositoriesResponse">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}documentObjectType" maxOccurs="unbounded" minOccurs="0"/>
+ *           <element name="repository" type="{http://www.cmis.org/ns/1.0}repositoryType" maxOccurs="unbounded" minOccurs="0"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -33,41 +33,41 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "object"
+    "repository"
 })
-@XmlRootElement(name = "documentCollection")
-public class DocumentCollection {
+@XmlRootElement(name = "getRepositoriesResponse")
+public class GetRepositoriesResponse {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected List object;
+    protected List repository;
 
     /**
-     * Gets the value of the object property.
+     * Gets the value of the repository property.
      * 
      * 

* This accessor method returns a reference to the live list, * not a snapshot. Therefore any modification you make to the * returned list will be present inside the JAXB object. - * This is why there is not a set method for the object property. + * This is why there is not a set method for the repository property. * *

* For example, to add a new item, do as follows: *

-     *    getObject().add(newItem);
+     *    getRepository().add(newItem);
      * 
* * *

* Objects of the following type(s) are allowed in the list - * {@link DocumentObjectType } + * {@link RepositoryType } * * */ - public List getObject() { - if (object == null) { - object = new ArrayList(); + public List getRepository() { + if (repository == null) { + repository = new ArrayList(); } - return this.object; + return this.repository; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetRepositoryInfo.java b/source/generated/org/alfresco/repo/cmis/ws/GetRepositoryInfo.java index d32c3fe406..1b4207bd8a 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetRepositoryInfo.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetRepositoryInfo.java @@ -3,6 +3,7 @@ package org.alfresco.repo.cmis.ws; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -18,6 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> @@ -28,9 +30,37 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") +@XmlType(name = "", propOrder = { + "repositoryId" +}) @XmlRootElement(name = "getRepositoryInfo") public class GetRepositoryInfo { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinition.java b/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinition.java index 38d01fb818..821c9eb650 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinition.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinition.java @@ -19,8 +19,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID"/> - * <element name="includeInheritedProperties" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -32,16 +32,40 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "typeId", - "includeInheritedProperties" + "repositoryId", + "typeId" }) @XmlRootElement(name = "getTypeDefinition") public class GetTypeDefinition { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String typeId; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean includeInheritedProperties; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } /** * Gets the value of the typeId property. @@ -67,28 +91,4 @@ public class GetTypeDefinition { this.typeId = value; } - /** - * Gets the value of the includeInheritedProperties property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public Boolean isIncludeInheritedProperties() { - return includeInheritedProperties; - } - - /** - * Sets the value of the includeInheritedProperties property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setIncludeInheritedProperties(Boolean value) { - this.includeInheritedProperties = value; - } - } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinitionResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinitionResponse.java index 34f85a0749..96fe799c2f 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinitionResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetTypeDefinitionResponse.java @@ -20,7 +20,6 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="type" type="{http://www.cmis.org/ns/1.0}objectTypeDefinitionType"/> - * <element name="canCreateInstances" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * </sequence> * </restriction> * </complexContent> @@ -32,16 +31,13 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "type", - "canCreateInstances" + "type" }) @XmlRootElement(name = "getTypeDefinitionResponse") public class GetTypeDefinitionResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected ObjectTypeDefinitionType type; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected boolean canCreateInstances; /** * Gets the value of the type property. @@ -67,20 +63,4 @@ public class GetTypeDefinitionResponse { this.type = value; } - /** - * Gets the value of the canCreateInstances property. - * - */ - public boolean isCanCreateInstances() { - return canCreateInstances; - } - - /** - * Sets the value of the canCreateInstances property. - * - */ - public void setCanCreateInstances(boolean value) { - this.canCreateInstances = value; - } - } diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetTypes.java b/source/generated/org/alfresco/repo/cmis/ws/GetTypes.java index c3490705f6..fb7620ad1a 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/GetTypes.java +++ b/source/generated/org/alfresco/repo/cmis/ws/GetTypes.java @@ -20,7 +20,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="type" type="{http://www.cmis.org/ns/1.0}getTypesEnum"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="typeId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/> * <element name="returnPropertyDefinitions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}maxItems" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}skipCount" minOccurs="0"/> @@ -35,7 +36,8 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "type", + "repositoryId", + "typeId", "returnPropertyDefinitions", "maxItems", "skipCount" @@ -44,7 +46,9 @@ import javax.xml.bind.annotation.XmlType; public class GetTypes { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected GetTypesEnum type; + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String typeId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected Boolean returnPropertyDefinitions; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") @@ -53,27 +57,51 @@ public class GetTypes { protected BigInteger skipCount; /** - * Gets the value of the type property. + * Gets the value of the repositoryId property. * * @return * possible object is - * {@link GetTypesEnum } + * {@link String } * */ - public GetTypesEnum getType() { - return type; + public String getRepositoryId() { + return repositoryId; } /** - * Sets the value of the type property. + * Sets the value of the repositoryId property. * * @param value * allowed object is - * {@link GetTypesEnum } + * {@link String } * */ - public void setType(GetTypesEnum value) { - this.type = value; + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the typeId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTypeId() { + return typeId; + } + + /** + * Sets the value of the typeId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTypeId(String value) { + this.typeId = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetTypesEnum.java b/source/generated/org/alfresco/repo/cmis/ws/GetTypesEnum.java deleted file mode 100644 index ccab3f489a..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/GetTypesEnum.java +++ /dev/null @@ -1,55 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; - - -/** - *

Java class for getTypesEnum. - * - *

The following schema fragment specifies the expected content contained within this class. - *

- *

- * <simpleType name="getTypesEnum">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Document"/>
- *     <enumeration value="Folder"/>
- *     <enumeration value="Relationship"/>
- *     <enumeration value="All"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlEnum -public enum GetTypesEnum { - - @XmlEnumValue("All") - ALL("All"), - @XmlEnumValue("Document") - DOCUMENT("Document"), - @XmlEnumValue("Folder") - FOLDER("Folder"), - @XmlEnumValue("Relationship") - RELATIONSHIP("Relationship"); - private final String value; - - GetTypesEnum(String v) { - value = v; - } - - public String value() { - return value; - } - - public static GetTypesEnum fromValue(String v) { - for (GetTypesEnum c: GetTypesEnum.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v.toString()); - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocs.java b/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocs.java deleted file mode 100644 index 109b63afd8..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocs.java +++ /dev/null @@ -1,123 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for getUnfiledDocs element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="getUnfiledDocs">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{http://www.cmis.org/ns/1.0}filter" minOccurs="0"/>
- *           <element name="maxDocuments" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *           <element name="skipCount" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "filter", - "maxDocuments", - "skipCount" -}) -@XmlRootElement(name = "getUnfiledDocs") -public class GetUnfiledDocs { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String filter; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected BigInteger maxDocuments; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected BigInteger skipCount; - - /** - * Gets the value of the filter property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFilter() { - return filter; - } - - /** - * Sets the value of the filter property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFilter(String value) { - this.filter = value; - } - - /** - * Gets the value of the maxDocuments property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getMaxDocuments() { - return maxDocuments; - } - - /** - * Sets the value of the maxDocuments property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setMaxDocuments(BigInteger value) { - this.maxDocuments = value; - } - - /** - * Gets the value of the skipCount property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getSkipCount() { - return skipCount; - } - - /** - * Sets the value of the skipCount property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setSkipCount(BigInteger value) { - this.skipCount = value; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocsResponse.java b/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocsResponse.java deleted file mode 100644 index 762bb26834..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/GetUnfiledDocsResponse.java +++ /dev/null @@ -1,86 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for getUnfiledDocsResponse element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="getUnfiledDocsResponse">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element ref="{http://www.cmis.org/ns/1.0}documentCollection"/>
- *           <element ref="{http://www.cmis.org/ns/1.0}hasMoreItems"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "documentCollection", - "hasMoreItems" -}) -@XmlRootElement(name = "getUnfiledDocsResponse") -public class GetUnfiledDocsResponse { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentCollection documentCollection; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected boolean hasMoreItems; - - /** - * Gets the value of the documentCollection property. - * - * @return - * possible object is - * {@link DocumentCollection } - * - */ - public DocumentCollection getDocumentCollection() { - return documentCollection; - } - - /** - * Sets the value of the documentCollection property. - * - * @param value - * allowed object is - * {@link DocumentCollection } - * - */ - public void setDocumentCollection(DocumentCollection value) { - this.documentCollection = value; - } - - /** - * Gets the value of the hasMoreItems property. - * - */ - public boolean isHasMoreItems() { - return hasMoreItems; - } - - /** - * Sets the value of the hasMoreItems property. - * - */ - public void setHasMoreItems(boolean value) { - this.hasMoreItems = value; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/HTML.java b/source/generated/org/alfresco/repo/cmis/ws/HTML.java new file mode 100755 index 0000000000..19fa41cb4f --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/HTML.java @@ -0,0 +1,70 @@ + +package org.alfresco.repo.cmis.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlType; +import org.w3c.dom.Element; + + +/** + *

Java class for HTML complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="HTML">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "HTML", propOrder = { + "any" +}) +public class HTML { + + @XmlAnyElement + protected List any; + + /** + * Gets the value of the any property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the any property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getAny().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Element } + * + * + */ + public List getAny() { + if (any == null) { + any = new ArrayList(); + } + return this.any; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/InvalidArgumentException.java b/source/generated/org/alfresco/repo/cmis/ws/InvalidArgumentException.java index 6e0141ebed..0d563f983d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/InvalidArgumentException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/InvalidArgumentException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "InvalidArgumentFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "invalidArgumentException", targetNamespace = "http://www.cmis.org/ns/1.0") public class InvalidArgumentException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault invalidArgumentFault; + private org.alfresco.repo.cmis.ws.BasicFault invalidArgumentException; public InvalidArgumentException() { super(); @@ -30,17 +30,17 @@ public class InvalidArgumentException extends Exception { super(message, cause); } - public InvalidArgumentException(String message, org.alfresco.repo.cmis.ws.BasicFault invalidArgumentFault) { + public InvalidArgumentException(String message, org.alfresco.repo.cmis.ws.BasicFault invalidArgumentException) { super(message); - this.invalidArgumentFault = invalidArgumentFault; + this.invalidArgumentException = invalidArgumentException; } - public InvalidArgumentException(String message, org.alfresco.repo.cmis.ws.BasicFault invalidArgumentFault, Throwable cause) { + public InvalidArgumentException(String message, org.alfresco.repo.cmis.ws.BasicFault invalidArgumentException, Throwable cause) { super(message, cause); - this.invalidArgumentFault = invalidArgumentFault; + this.invalidArgumentException = invalidArgumentException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.invalidArgumentFault; + return this.invalidArgumentException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/JoinEnum.java b/source/generated/org/alfresco/repo/cmis/ws/JoinEnum.java new file mode 100755 index 0000000000..ddd98c3924 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/JoinEnum.java @@ -0,0 +1,52 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlEnumValue; + + +/** + *

Java class for joinEnum. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+ * <simpleType name="joinEnum">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="noJoin"/>
+ *     <enumeration value="innerOnly"/>
+ *     <enumeration value="innerAndOuter"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlEnum +public enum JoinEnum { + + @XmlEnumValue("innerAndOuter") + INNER_AND_OUTER("innerAndOuter"), + @XmlEnumValue("innerOnly") + INNER_ONLY("innerOnly"), + @XmlEnumValue("noJoin") + NO_JOIN("noJoin"); + private final String value; + + JoinEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + public static JoinEnum fromValue(String v) { + for (JoinEnum c: JoinEnum.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v.toString()); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/MoveObject.java b/source/generated/org/alfresco/repo/cmis/ws/MoveObject.java index e68554f3ae..6a69852aa0 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/MoveObject.java +++ b/source/generated/org/alfresco/repo/cmis/ws/MoveObject.java @@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID"/> - * <element name="sourceFolderId" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="targetFolderId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="sourceFolderId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -33,20 +34,47 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "objectId", - "folderId", + "targetFolderId", "sourceFolderId" }) @XmlRootElement(name = "moveObject") public class MoveObject { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String objectId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String folderId; + protected String targetFolderId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String sourceFolderId; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the objectId property. * @@ -72,27 +100,27 @@ public class MoveObject { } /** - * Gets the value of the folderId property. + * Gets the value of the targetFolderId property. * * @return * possible object is * {@link String } * */ - public String getFolderId() { - return folderId; + public String getTargetFolderId() { + return targetFolderId; } /** - * Sets the value of the folderId property. + * Sets the value of the targetFolderId property. * * @param value * allowed object is * {@link String } * */ - public void setFolderId(String value) { - this.folderId = value; + public void setTargetFolderId(String value) { + this.targetFolderId = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/MultiFilingService.java b/source/generated/org/alfresco/repo/cmis/ws/MultiFilingService.java new file mode 100755 index 0000000000..e8f119da3d --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/MultiFilingService.java @@ -0,0 +1,58 @@ + +package org.alfresco.repo.cmis.ws; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import org.alfresco.repo.cmis.ws.MultiFilingServicePort; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:19 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebServiceClient(name = "MultiFilingService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/MultiFilingService.wsdl") +public class MultiFilingService extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://www.cmis.org/ns/1.0", "MultiFilingService"); + public final static QName MultiFilingServicePort = new QName("http://www.cmis.org/ns/1.0", "MultiFilingServicePort"); + static { + URL url = null; + try { + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/MultiFilingService.wsdl"); + } catch (MalformedURLException e) { + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/MultiFilingService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public MultiFilingService(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public MultiFilingService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public MultiFilingService() { + super(WSDL_LOCATION, SERVICE); + } + + /** + * + * @return + * returns MultiFilingServicePort + */ + @WebEndpoint(name = "MultiFilingServicePort") + public MultiFilingServicePort getMultiFilingServicePort() { + return super.getPort(MultiFilingServicePort, MultiFilingServicePort.class); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/MultiFilingServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/MultiFilingServicePort.java new file mode 100755 index 0000000000..d1e406984a --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/MultiFilingServicePort.java @@ -0,0 +1,44 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:19 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebService(targetNamespace = "http://www.cmis.org/ns/1.0", name = "MultiFilingServicePort") + +public interface MultiFilingServicePort { + + @ResponseWrapper(localName = "removeObjectFromFolderResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.RemoveObjectFromFolderResponse") + @RequestWrapper(localName = "removeObjectFromFolder", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.RemoveObjectFromFolder") + @WebMethod + public void removeObjectFromFolder( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String objectId, + @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String folderId + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, NotInFolderException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; + + @ResponseWrapper(localName = "addObjectToFolderResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.AddObjectToFolderResponse") + @RequestWrapper(localName = "addObjectToFolder", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.AddObjectToFolder") + @WebMethod + public void addObjectToFolder( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String objectId, + @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String folderId + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/NavigationService.java b/source/generated/org/alfresco/repo/cmis/ws/NavigationService.java index bda5c0f409..943e9f23a8 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/NavigationService.java +++ b/source/generated/org/alfresco/repo/cmis/ws/NavigationService.java @@ -11,12 +11,12 @@ import org.alfresco.repo.cmis.ws.NavigationServicePort; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:03 EEST 2008 * Generated source version: 2.0.6 * */ -@WebServiceClient(name = "NavigationService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/NavigationService.wsdl") +@WebServiceClient(name = "NavigationService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/NavigationService.wsdl") public class NavigationService extends Service { public final static URL WSDL_LOCATION; @@ -25,9 +25,9 @@ public class NavigationService extends Service { static { URL url = null; try { - url = new URL("file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/NavigationService.wsdl"); + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/NavigationService.wsdl"); } catch (MalformedURLException e) { - System.err.println("Can not initialize the default wsdl from file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/NavigationService.wsdl"); + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/NavigationService.wsdl"); // e.printStackTrace(); } WSDL_LOCATION = url; diff --git a/source/generated/org/alfresco/repo/cmis/ws/NavigationServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/NavigationServicePort.java index aa1155e844..f8a70e436d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/NavigationServicePort.java +++ b/source/generated/org/alfresco/repo/cmis/ws/NavigationServicePort.java @@ -10,7 +10,7 @@ import javax.jws.soap.SOAPBinding.ParameterStyle; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:03 EEST 2008 * Generated source version: 2.0.6 * */ @@ -26,7 +26,7 @@ public interface NavigationServicePort { public org.alfresco.repo.cmis.ws.GetDescendantsResponse getDescendants( @WebParam(partName = "parameters", name = "getDescendants", targetNamespace = "http://www.cmis.org/ns/1.0") GetDescendants parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "getCheckedoutDocsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -34,15 +34,7 @@ public interface NavigationServicePort { public org.alfresco.repo.cmis.ws.GetCheckedoutDocsResponse getCheckedoutDocs( @WebParam(partName = "parameters", name = "getCheckedoutDocs", targetNamespace = "http://www.cmis.org/ns/1.0") GetCheckedoutDocs parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; - - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - @WebResult(name = "getDocumentParentsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") - @WebMethod - public org.alfresco.repo.cmis.ws.GetDocumentParentsResponse getDocumentParents( - @WebParam(partName = "parameters", name = "getDocumentParents", targetNamespace = "http://www.cmis.org/ns/1.0") - GetDocumentParents parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "getChildrenResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -50,7 +42,15 @@ public interface NavigationServicePort { public org.alfresco.repo.cmis.ws.GetChildrenResponse getChildren( @WebParam(partName = "parameters", name = "getChildren", targetNamespace = "http://www.cmis.org/ns/1.0") GetChildren parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; + + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + @WebResult(name = "getObjectParentsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") + @WebMethod + public org.alfresco.repo.cmis.ws.GetObjectParentsResponse getObjectParents( + @WebParam(partName = "parameters", name = "getObjectParents", targetNamespace = "http://www.cmis.org/ns/1.0") + GetObjectParents parameters + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "getFolderParentResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -58,13 +58,5 @@ public interface NavigationServicePort { public org.alfresco.repo.cmis.ws.GetFolderParentResponse getFolderParent( @WebParam(partName = "parameters", name = "getFolderParent", targetNamespace = "http://www.cmis.org/ns/1.0") GetFolderParent parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; - - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - @WebResult(name = "getUnfiledDocsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") - @WebMethod - public org.alfresco.repo.cmis.ws.GetUnfiledDocsResponse getUnfiledDocs( - @WebParam(partName = "parameters", name = "getUnfiledDocs", targetNamespace = "http://www.cmis.org/ns/1.0") - GetUnfiledDocs parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/NotInFolderException.java b/source/generated/org/alfresco/repo/cmis/ws/NotInFolderException.java index bb42996f30..85e3eafa46 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/NotInFolderException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/NotInFolderException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 + * Tue Jul 29 18:22:19 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "NotInFolderFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "notInFolderException", targetNamespace = "http://www.cmis.org/ns/1.0") public class NotInFolderException extends Exception { - public static final long serialVersionUID = 20080527141113L; + public static final long serialVersionUID = 20080729182219L; - private org.alfresco.repo.cmis.ws.BasicFault notInFolderFault; + private org.alfresco.repo.cmis.ws.BasicFault notInFolderException; public NotInFolderException() { super(); @@ -30,17 +30,17 @@ public class NotInFolderException extends Exception { super(message, cause); } - public NotInFolderException(String message, org.alfresco.repo.cmis.ws.BasicFault notInFolderFault) { + public NotInFolderException(String message, org.alfresco.repo.cmis.ws.BasicFault notInFolderException) { super(message); - this.notInFolderFault = notInFolderFault; + this.notInFolderException = notInFolderException; } - public NotInFolderException(String message, org.alfresco.repo.cmis.ws.BasicFault notInFolderFault, Throwable cause) { + public NotInFolderException(String message, org.alfresco.repo.cmis.ws.BasicFault notInFolderException, Throwable cause) { super(message, cause); - this.notInFolderFault = notInFolderFault; + this.notInFolderException = notInFolderException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.notInFolderFault; + return this.notInFolderException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/FolderCollection.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectCollectionType.java old mode 100644 new mode 100755 similarity index 57% rename from source/generated/org/alfresco/repo/cmis/ws/FolderCollection.java rename to source/generated/org/alfresco/repo/cmis/ws/ObjectCollectionType.java index 855a689ad3..ceae0c0d07 --- a/source/generated/org/alfresco/repo/cmis/ws/FolderCollection.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectCollectionType.java @@ -6,40 +6,36 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; /** - *

Java class for folderCollection element declaration. + *

Java class for objectCollectionType complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="folderCollection">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}folderObjectType" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <complexType name="objectCollectionType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="object" type="{http://www.cmis.org/ns/1.0}objectType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
  * 
* * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { +@XmlType(name = "objectCollectionType", propOrder = { "object" }) -@XmlRootElement(name = "folderCollection") -public class FolderCollection { +public class ObjectCollectionType { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List object; + protected List object; /** * Gets the value of the object property. @@ -59,13 +55,13 @@ public class FolderCollection { * *

* Objects of the following type(s) are allowed in the list - * {@link FolderObjectType } + * {@link ObjectType } * * */ - public List getObject() { + public List getObject() { if (object == null) { - object = new ArrayList(); + object = new ArrayList(); } return this.object; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectFactory.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectFactory.java deleted file mode 100644 index 9c08f971eb..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectFactory.java +++ /dev/null @@ -1,933 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.math.BigInteger; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; -import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete; -import org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionCollection; -import org.alfresco.repo.cmis.ws.GetTypesResponse.Types; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.alfresco.repo.cmis.ws package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ObjectNotFoundFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "ObjectNotFoundFault"); - private final static QName _OffsetFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "OffsetFault"); - private final static QName _StorageFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "StorageFault"); - private final static QName _RuntimeFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "RuntimeFault"); - private final static QName _StreamNotSupportedFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "StreamNotSupportedFault"); - private final static QName _HasMoreItems_QNAME = new QName("http://www.cmis.org/ns/1.0", "hasMoreItems"); - private final static QName _FilterNotValidFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "FilterNotValidFault"); - private final static QName _SkipCount_QNAME = new QName("http://www.cmis.org/ns/1.0", "skipCount"); - private final static QName _Parent_QNAME = new QName("http://www.cmis.org/ns/1.0", "parent"); - private final static QName _InvalidArgumentFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "InvalidArgumentFault"); - private final static QName _Name_QNAME = new QName("http://www.cmis.org/ns/1.0", "name"); - private final static QName _OperationNotSupportedFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "OperationNotSupportedFault"); - private final static QName _SourceOID_QNAME = new QName("http://www.cmis.org/ns/1.0", "sourceOID"); - private final static QName _Filter_QNAME = new QName("http://www.cmis.org/ns/1.0", "filter"); - private final static QName _TypeNotFoundFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "TypeNotFoundFault"); - private final static QName _PermissionDeniedFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "PermissionDeniedFault"); - private final static QName _ConcurrencyFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "ConcurrencyFault"); - private final static QName _NotInFolderFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "NotInFolderFault"); - private final static QName _FolderNotValidFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "FolderNotValidFault"); - private final static QName _AlreadyExistsFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "AlreadyExistsFault"); - private final static QName _ConstraintViolationFault_QNAME = new QName("http://www.cmis.org/ns/1.0", "ConstraintViolationFault"); - private final static QName _MaxItems_QNAME = new QName("http://www.cmis.org/ns/1.0", "maxItems"); - private final static QName _TargetOID_QNAME = new QName("http://www.cmis.org/ns/1.0", "targetOID"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.alfresco.repo.cmis.ws - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link DeleteObject } - * - */ - public DeleteObject createDeleteObject() { - return new DeleteObject(); - } - - /** - * Create an instance of {@link GetRelationships } - * - */ - public GetRelationships createGetRelationships() { - return new GetRelationships(); - } - - /** - * Create an instance of {@link DocumentFolderOrRelationshipObjectType } - * - */ - public DocumentFolderOrRelationshipObjectType createDocumentFolderOrRelationshipObjectType() { - return new DocumentFolderOrRelationshipObjectType(); - } - - /** - * Create an instance of {@link CheckInResponse } - * - */ - public CheckInResponse createCheckInResponse() { - return new CheckInResponse(); - } - - /** - * Create an instance of {@link GetDescendants } - * - */ - public GetDescendants createGetDescendants() { - return new GetDescendants(); - } - - /** - * Create an instance of {@link QueryResponse } - * - */ - public QueryResponse createQueryResponse() { - return new QueryResponse(); - } - - /** - * Create an instance of {@link GetChildrenResponse } - * - */ - public GetChildrenResponse createGetChildrenResponse() { - return new GetChildrenResponse(); - } - - /** - * Create an instance of {@link BasicFault } - * - */ - public BasicFault createBasicFault() { - return new BasicFault(); - } - - /** - * Create an instance of {@link UpdatePropertiesResponse } - * - */ - public UpdatePropertiesResponse createUpdatePropertiesResponse() { - return new UpdatePropertiesResponse(); - } - - /** - * Create an instance of {@link GetFolderParentResponse } - * - */ - public GetFolderParentResponse createGetFolderParentResponse() { - return new GetFolderParentResponse(); - } - - /** - * Create an instance of {@link ObjectTypeDefinitionType } - * - */ - public ObjectTypeDefinitionType createObjectTypeDefinitionType() { - return new ObjectTypeDefinitionType(); - } - - /** - * Create an instance of {@link DeleteAllVersions } - * - */ - public DeleteAllVersions createDeleteAllVersions() { - return new DeleteAllVersions(); - } - - /** - * Create an instance of {@link RepositoryInfoType } - * - */ - public RepositoryInfoType createRepositoryInfoType() { - return new RepositoryInfoType(); - } - - /** - * Create an instance of {@link GetCheckedoutDocs } - * - */ - public GetCheckedoutDocs createGetCheckedoutDocs() { - return new GetCheckedoutDocs(); - } - - /** - * Create an instance of {@link RemoveDocumentFromFolderResponse } - * - */ - public RemoveDocumentFromFolderResponse createRemoveDocumentFromFolderResponse() { - return new RemoveDocumentFromFolderResponse(); - } - - /** - * Create an instance of {@link DeleteTree } - * - */ - public DeleteTree createDeleteTree() { - return new DeleteTree(); - } - - /** - * Create an instance of {@link ContentStream } - * - */ - public ContentStream createContentStream() { - return new ContentStream(); - } - - /** - * Create an instance of {@link GetRepositoryInfoResponse } - * - */ - public GetRepositoryInfoResponse createGetRepositoryInfoResponse() { - return new GetRepositoryInfoResponse(); - } - - /** - * Create an instance of {@link GetAllowableActionsResponse } - * - */ - public GetAllowableActionsResponse createGetAllowableActionsResponse() { - return new GetAllowableActionsResponse(); - } - - /** - * Create an instance of {@link RemoveDocumentFromFolder } - * - */ - public RemoveDocumentFromFolder createRemoveDocumentFromFolder() { - return new RemoveDocumentFromFolder(); - } - - /** - * Create an instance of {@link GetAllVersions } - * - */ - public GetAllVersions createGetAllVersions() { - return new GetAllVersions(); - } - - /** - * Create an instance of {@link AddDocumentToFolderResponse } - * - */ - public AddDocumentToFolderResponse createAddDocumentToFolderResponse() { - return new AddDocumentToFolderResponse(); - } - - /** - * Create an instance of {@link SetContentStream } - * - */ - public SetContentStream createSetContentStream() { - return new SetContentStream(); - } - - /** - * Create an instance of {@link GetDocumentParents } - * - */ - public GetDocumentParents createGetDocumentParents() { - return new GetDocumentParents(); - } - - /** - * Create an instance of {@link CancelCheckOutResponse } - * - */ - public CancelCheckOutResponse createCancelCheckOutResponse() { - return new CancelCheckOutResponse(); - } - - /** - * Create an instance of {@link AddDocumentToFolder } - * - */ - public AddDocumentToFolder createAddDocumentToFolder() { - return new AddDocumentToFolder(); - } - - /** - * Create an instance of {@link GetChildren } - * - */ - public GetChildren createGetChildren() { - return new GetChildren(); - } - - /** - * Create an instance of {@link GetRootFolderResponse } - * - */ - public GetRootFolderResponse createGetRootFolderResponse() { - return new GetRootFolderResponse(); - } - - /** - * Create an instance of {@link GetContentStream } - * - */ - public GetContentStream createGetContentStream() { - return new GetContentStream(); - } - - /** - * Create an instance of {@link GetTypesResponse } - * - */ - public GetTypesResponse createGetTypesResponse() { - return new GetTypesResponse(); - } - - /** - * Create an instance of {@link GetUnfiledDocs } - * - */ - public GetUnfiledDocs createGetUnfiledDocs() { - return new GetUnfiledDocs(); - } - - /** - * Create an instance of {@link MoveObject } - * - */ - public MoveObject createMoveObject() { - return new MoveObject(); - } - - /** - * Create an instance of {@link GetProperties } - * - */ - public GetProperties createGetProperties() { - return new GetProperties(); - } - - /** - * Create an instance of {@link DeleteTreeResponse } - * - */ - public DeleteTreeResponse createDeleteTreeResponse() { - return new DeleteTreeResponse(); - } - - /** - * Create an instance of {@link GetUnfiledDocsResponse } - * - */ - public GetUnfiledDocsResponse createGetUnfiledDocsResponse() { - return new GetUnfiledDocsResponse(); - } - - /** - * Create an instance of {@link Types } - * - */ - public Types createGetTypesResponseTypes() { - return new Types(); - } - - /** - * Create an instance of {@link RelationshipObjectType } - * - */ - public RelationshipObjectType createRelationshipObjectType() { - return new RelationshipObjectType(); - } - - /** - * Create an instance of {@link GetRelationshipsResponse } - * - */ - public GetRelationshipsResponse createGetRelationshipsResponse() { - return new GetRelationshipsResponse(); - } - - /** - * Create an instance of {@link DocumentCollection } - * - */ - public DocumentCollection createDocumentCollection() { - return new DocumentCollection(); - } - - /** - * Create an instance of {@link DocumentObjectType } - * - */ - public DocumentObjectType createDocumentObjectType() { - return new DocumentObjectType(); - } - - /** - * Create an instance of {@link CancelCheckOut } - * - */ - public CancelCheckOut createCancelCheckOut() { - return new CancelCheckOut(); - } - - /** - * Create an instance of {@link GetTypeDefinitionResponse } - * - */ - public GetTypeDefinitionResponse createGetTypeDefinitionResponse() { - return new GetTypeDefinitionResponse(); - } - - /** - * Create an instance of {@link GetAllVersionsResponse } - * - */ - public GetAllVersionsResponse createGetAllVersionsResponse() { - return new GetAllVersionsResponse(); - } - - /** - * Create an instance of {@link Children } - * - */ - public Children createChildren() { - return new Children(); - } - - /** - * Create an instance of {@link Property } - * - */ - public Property createProperty() { - return new Property(); - } - - /** - * Create an instance of {@link DocumentOrFolderObjectType } - * - */ - public DocumentOrFolderObjectType createDocumentOrFolderObjectType() { - return new DocumentOrFolderObjectType(); - } - - /** - * Create an instance of {@link GetFolderParent } - * - */ - public GetFolderParent createGetFolderParent() { - return new GetFolderParent(); - } - - /** - * Create an instance of {@link ChoiceType } - * - */ - public ChoiceType createChoiceType() { - return new ChoiceType(); - } - - /** - * Create an instance of {@link CapabilitiesType } - * - */ - public CapabilitiesType createCapabilitiesType() { - return new CapabilitiesType(); - } - - /** - * Create an instance of {@link Query } - * - */ - public Query createQuery() { - return new Query(); - } - - /** - * Create an instance of {@link CreateFolderResponse } - * - */ - public CreateFolderResponse createCreateFolderResponse() { - return new CreateFolderResponse(); - } - - /** - * Create an instance of {@link CreateDocument } - * - */ - public CreateDocument createCreateDocument() { - return new CreateDocument(); - } - - /** - * Create an instance of {@link DeleteAllVersionsResponse } - * - */ - public DeleteAllVersionsResponse createDeleteAllVersionsResponse() { - return new DeleteAllVersionsResponse(); - } - - /** - * Create an instance of {@link GetRepositoryInfo } - * - */ - public GetRepositoryInfo createGetRepositoryInfo() { - return new GetRepositoryInfo(); - } - - /** - * Create an instance of {@link FailedToDelete } - * - */ - public FailedToDelete createDeleteTreeResponseFailedToDelete() { - return new FailedToDelete(); - } - - /** - * Create an instance of {@link DeleteContentStreamResponse } - * - */ - public DeleteContentStreamResponse createDeleteContentStreamResponse() { - return new DeleteContentStreamResponse(); - } - - /** - * Create an instance of {@link GetTypes } - * - */ - public GetTypes createGetTypes() { - return new GetTypes(); - } - - /** - * Create an instance of {@link CreateDocumentResponse } - * - */ - public CreateDocumentResponse createCreateDocumentResponse() { - return new CreateDocumentResponse(); - } - - /** - * Create an instance of {@link PropertyAttributesType } - * - */ - public PropertyAttributesType createPropertyAttributesType() { - return new PropertyAttributesType(); - } - - /** - * Create an instance of {@link GetPropertiesResponse } - * - */ - public GetPropertiesResponse createGetPropertiesResponse() { - return new GetPropertiesResponse(); - } - - /** - * Create an instance of {@link CreateRelationshipResponse } - * - */ - public CreateRelationshipResponse createCreateRelationshipResponse() { - return new CreateRelationshipResponse(); - } - - /** - * Create an instance of {@link DeleteContentStream } - * - */ - public DeleteContentStream createDeleteContentStream() { - return new DeleteContentStream(); - } - - /** - * Create an instance of {@link UpdateProperties } - * - */ - public UpdateProperties createUpdateProperties() { - return new UpdateProperties(); - } - - /** - * Create an instance of {@link FolderCollection } - * - */ - public FolderCollection createFolderCollection() { - return new FolderCollection(); - } - - /** - * Create an instance of {@link GetDocumentParentsResponse } - * - */ - public GetDocumentParentsResponse createGetDocumentParentsResponse() { - return new GetDocumentParentsResponse(); - } - - /** - * Create an instance of {@link FolderObjectType } - * - */ - public FolderObjectType createFolderObjectType() { - return new FolderObjectType(); - } - - /** - * Create an instance of {@link GetAllowableActions } - * - */ - public GetAllowableActions createGetAllowableActions() { - return new GetAllowableActions(); - } - - /** - * Create an instance of {@link MoveObjectResponse } - * - */ - public MoveObjectResponse createMoveObjectResponse() { - return new MoveObjectResponse(); - } - - /** - * Create an instance of {@link DeleteObjectResponse } - * - */ - public DeleteObjectResponse createDeleteObjectResponse() { - return new DeleteObjectResponse(); - } - - /** - * Create an instance of {@link SetContentStreamResponse } - * - */ - public SetContentStreamResponse createSetContentStreamResponse() { - return new SetContentStreamResponse(); - } - - /** - * Create an instance of {@link GetContentStreamResponse } - * - */ - public GetContentStreamResponse createGetContentStreamResponse() { - return new GetContentStreamResponse(); - } - - /** - * Create an instance of {@link CreateFolder } - * - */ - public CreateFolder createCreateFolder() { - return new CreateFolder(); - } - - /** - * Create an instance of {@link AllowableActionCollection } - * - */ - public AllowableActionCollection createGetAllowableActionsResponseAllowableActionCollection() { - return new AllowableActionCollection(); - } - - /** - * Create an instance of {@link DocumentAndFolderCollection } - * - */ - public DocumentAndFolderCollection createDocumentAndFolderCollection() { - return new DocumentAndFolderCollection(); - } - - /** - * Create an instance of {@link GetDescendantsResponse } - * - */ - public GetDescendantsResponse createGetDescendantsResponse() { - return new GetDescendantsResponse(); - } - - /** - * Create an instance of {@link CheckOutResponse } - * - */ - public CheckOutResponse createCheckOutResponse() { - return new CheckOutResponse(); - } - - /** - * Create an instance of {@link RelationshipCollection } - * - */ - public RelationshipCollection createRelationshipCollection() { - return new RelationshipCollection(); - } - - /** - * Create an instance of {@link CheckIn } - * - */ - public CheckIn createCheckIn() { - return new CheckIn(); - } - - /** - * Create an instance of {@link GetRootFolder } - * - */ - public GetRootFolder createGetRootFolder() { - return new GetRootFolder(); - } - - /** - * Create an instance of {@link GetTypeDefinition } - * - */ - public GetTypeDefinition createGetTypeDefinition() { - return new GetTypeDefinition(); - } - - /** - * Create an instance of {@link CheckOut } - * - */ - public CheckOut createCheckOut() { - return new CheckOut(); - } - - /** - * Create an instance of {@link CreateRelationship } - * - */ - public CreateRelationship createCreateRelationship() { - return new CreateRelationship(); - } - - /** - * Create an instance of {@link GetCheckedoutDocsResponse } - * - */ - public GetCheckedoutDocsResponse createGetCheckedoutDocsResponse() { - return new GetCheckedoutDocsResponse(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "ObjectNotFoundFault") - public JAXBElement createObjectNotFoundFault(BasicFault value) { - return new JAXBElement(_ObjectNotFoundFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "OffsetFault") - public JAXBElement createOffsetFault(BasicFault value) { - return new JAXBElement(_OffsetFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "StorageFault") - public JAXBElement createStorageFault(BasicFault value) { - return new JAXBElement(_StorageFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "RuntimeFault") - public JAXBElement createRuntimeFault(BasicFault value) { - return new JAXBElement(_RuntimeFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "StreamNotSupportedFault") - public JAXBElement createStreamNotSupportedFault(BasicFault value) { - return new JAXBElement(_StreamNotSupportedFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "hasMoreItems") - public JAXBElement createHasMoreItems(Boolean value) { - return new JAXBElement(_HasMoreItems_QNAME, Boolean.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "FilterNotValidFault") - public JAXBElement createFilterNotValidFault(BasicFault value) { - return new JAXBElement(_FilterNotValidFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "skipCount") - public JAXBElement createSkipCount(BigInteger value) { - return new JAXBElement(_SkipCount_QNAME, BigInteger.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "parent") - public JAXBElement createParent(String value) { - return new JAXBElement(_Parent_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "InvalidArgumentFault") - public JAXBElement createInvalidArgumentFault(BasicFault value) { - return new JAXBElement(_InvalidArgumentFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "name") - public JAXBElement createName(String value) { - return new JAXBElement(_Name_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "OperationNotSupportedFault") - public JAXBElement createOperationNotSupportedFault(BasicFault value) { - return new JAXBElement(_OperationNotSupportedFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "sourceOID") - public JAXBElement createSourceOID(String value) { - return new JAXBElement(_SourceOID_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "filter") - public JAXBElement createFilter(String value) { - return new JAXBElement(_Filter_QNAME, String.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "TypeNotFoundFault") - public JAXBElement createTypeNotFoundFault(BasicFault value) { - return new JAXBElement(_TypeNotFoundFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "PermissionDeniedFault") - public JAXBElement createPermissionDeniedFault(BasicFault value) { - return new JAXBElement(_PermissionDeniedFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "ConcurrencyFault") - public JAXBElement createConcurrencyFault(BasicFault value) { - return new JAXBElement(_ConcurrencyFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "NotInFolderFault") - public JAXBElement createNotInFolderFault(BasicFault value) { - return new JAXBElement(_NotInFolderFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "FolderNotValidFault") - public JAXBElement createFolderNotValidFault(BasicFault value) { - return new JAXBElement(_FolderNotValidFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "AlreadyExistsFault") - public JAXBElement createAlreadyExistsFault(BasicFault value) { - return new JAXBElement(_AlreadyExistsFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BasicFault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "ConstraintViolationFault") - public JAXBElement createConstraintViolationFault(BasicFault value) { - return new JAXBElement(_ConstraintViolationFault_QNAME, BasicFault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "maxItems") - public JAXBElement createMaxItems(BigInteger value) { - return new JAXBElement(_MaxItems_QNAME, BigInteger.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.cmis.org/ns/1.0", name = "targetOID") - public JAXBElement createTargetOID(String value) { - return new JAXBElement(_TargetOID_QNAME, String.class, null, value); - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectNotFoundException.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectNotFoundException.java index a2969bebb2..ac51f4ce1e 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectNotFoundException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectNotFoundException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "ObjectNotFoundFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "objectNotFoundException", targetNamespace = "http://www.cmis.org/ns/1.0") public class ObjectNotFoundException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault objectNotFoundFault; + private org.alfresco.repo.cmis.ws.BasicFault objectNotFoundException; public ObjectNotFoundException() { super(); @@ -30,17 +30,17 @@ public class ObjectNotFoundException extends Exception { super(message, cause); } - public ObjectNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault objectNotFoundFault) { + public ObjectNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault objectNotFoundException) { super(message); - this.objectNotFoundFault = objectNotFoundFault; + this.objectNotFoundException = objectNotFoundException; } - public ObjectNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault objectNotFoundFault, Throwable cause) { + public ObjectNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault objectNotFoundException, Throwable cause) { super(message, cause); - this.objectNotFoundFault = objectNotFoundFault; + this.objectNotFoundException = objectNotFoundException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.objectNotFoundFault; + return this.objectNotFoundException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectService.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectService.java index 79ae14cbab..563673bc49 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectService.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectService.java @@ -11,12 +11,12 @@ import org.alfresco.repo.cmis.ws.ObjectServicePort; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:14 EEST 2008 + * Tue Jul 29 18:21:47 EEST 2008 * Generated source version: 2.0.6 * */ -@WebServiceClient(name = "ObjectService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/ObjectService.wsdl") +@WebServiceClient(name = "ObjectService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/ObjectService.wsdl") public class ObjectService extends Service { public final static URL WSDL_LOCATION; @@ -25,9 +25,9 @@ public class ObjectService extends Service { static { URL url = null; try { - url = new URL("file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/ObjectService.wsdl"); + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/ObjectService.wsdl"); } catch (MalformedURLException e) { - System.err.println("Can not initialize the default wsdl from file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/ObjectService.wsdl"); + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/ObjectService.wsdl"); // e.printStackTrace(); } WSDL_LOCATION = url; diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectServicePort.java index 2bc94ae12d..e5f645a651 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectServicePort.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectServicePort.java @@ -3,6 +3,7 @@ package org.alfresco.repo.cmis.ws; import javax.jws.WebMethod; import javax.jws.WebParam; +import javax.jws.WebParam.Mode; import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -12,7 +13,7 @@ import javax.xml.ws.ResponseWrapper; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:14 EEST 2008 + * Tue Jul 29 18:21:47 EEST 2008 * Generated source version: 2.0.6 * */ @@ -26,69 +27,96 @@ public interface ObjectServicePort { @WebResult(name = "failedToDelete", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod public org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete deleteTree( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String folderId, - @WebParam(name = "unfileMultiFiledDocuments", targetNamespace = "http://www.cmis.org/ns/1.0") - org.alfresco.repo.cmis.ws.DeleteWithMultiFilingEnum unfileMultiFiledDocuments, + @WebParam(name = "unfileNonfolderObjects", targetNamespace = "http://www.cmis.org/ns/1.0") + org.alfresco.repo.cmis.ws.UnfileNonfolderObjectsEnum unfileNonfolderObjects, @WebParam(name = "continueOnFailure", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.Boolean continueOnFailure - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @ResponseWrapper(localName = "getAllowableActionsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetAllowableActionsResponse") @RequestWrapper(localName = "getAllowableActions", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetAllowableActions") - @WebResult(name = "allowableActionCollection", targetNamespace = "http://www.cmis.org/ns/1.0") + @WebResult(name = "allowableActions", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod - public org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionCollection getAllowableActions( + public org.alfresco.repo.cmis.ws.AllowableActionsType getAllowableActions( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String objectId, @WebParam(name = "asUser", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String asUser - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; @ResponseWrapper(localName = "moveObjectResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.MoveObjectResponse") @RequestWrapper(localName = "moveObject", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.MoveObject") @WebMethod public void moveObject( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String objectId, - @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") - java.lang.String folderId, + @WebParam(name = "targetFolderId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String targetFolderId, @WebParam(name = "sourceFolderId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String sourceFolderId - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, NotInFolderException, ConstraintViolationException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, NotInFolderException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @ResponseWrapper(localName = "deleteContentStreamResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteContentStreamResponse") @RequestWrapper(localName = "deleteContentStream", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteContentStream") @WebMethod public void deleteContentStream( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "documentId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String documentId - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, VersioningException, ObjectNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, PermissionDeniedException; @ResponseWrapper(localName = "createFolderResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreateFolderResponse") @RequestWrapper(localName = "createFolder", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreateFolder") @WebResult(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod public java.lang.String createFolder( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "typeId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String typeId, - @WebParam(name = "propertyCollection", targetNamespace = "http://www.cmis.org/ns/1.0") - org.alfresco.repo.cmis.ws.FolderObjectType propertyCollection, + @WebParam(name = "properties", targetNamespace = "http://www.cmis.org/ns/1.0") + org.alfresco.repo.cmis.ws.PropertiesType properties, @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String folderId - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @ResponseWrapper(localName = "updatePropertiesResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.UpdatePropertiesResponse") @RequestWrapper(localName = "updateProperties", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.UpdateProperties") @WebMethod public void updateProperties( - @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") - java.lang.String objectId, + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(mode = WebParam.Mode.INOUT, name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + javax.xml.ws.Holder objectId, @WebParam(name = "changeToken", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String changeToken, - @WebParam(name = "object", targetNamespace = "http://www.cmis.org/ns/1.0") - org.alfresco.repo.cmis.ws.DocumentFolderOrRelationshipObjectType object - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, PermissionDeniedException; + @WebParam(name = "properties", targetNamespace = "http://www.cmis.org/ns/1.0") + org.alfresco.repo.cmis.ws.PropertiesType properties + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; + + @ResponseWrapper(localName = "createPolicyResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreatePolicyResponse") + @RequestWrapper(localName = "createPolicy", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreatePolicy") + @WebResult(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + @WebMethod + public java.lang.String createPolicy( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(name = "typeId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String typeId, + @WebParam(name = "properties", targetNamespace = "http://www.cmis.org/ns/1.0") + org.alfresco.repo.cmis.ws.PropertiesType properties, + @WebParam(name = "folderId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String folderId + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "createDocumentResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -96,35 +124,32 @@ public interface ObjectServicePort { public org.alfresco.repo.cmis.ws.CreateDocumentResponse createDocument( @WebParam(partName = "parameters", name = "createDocument", targetNamespace = "http://www.cmis.org/ns/1.0") CreateDocument parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, FolderNotValidException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, FolderNotValidException, PermissionDeniedException; - @ResponseWrapper(localName = "getContentStreamResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetContentStreamResponse") - @RequestWrapper(localName = "getContentStream", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetContentStream") - @WebResult(name = "stream", targetNamespace = "http://www.cmis.org/ns/1.0") + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + @WebResult(name = "getContentStreamResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @WebMethod - public byte[] getContentStream( - @WebParam(name = "documentId", targetNamespace = "http://www.cmis.org/ns/1.0") - java.lang.String documentId, - @WebParam(name = "offset", targetNamespace = "http://www.cmis.org/ns/1.0") - java.math.BigInteger offset, - @WebParam(name = "length", targetNamespace = "http://www.cmis.org/ns/1.0") - java.math.BigInteger length - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, StorageException, OperationNotSupportedException, StreamNotSupportedException, OffsetException, PermissionDeniedException; + public org.alfresco.repo.cmis.ws.GetContentStreamResponse getContentStream( + @WebParam(partName = "parameters", name = "getContentStream", targetNamespace = "http://www.cmis.org/ns/1.0") + GetContentStream parameters + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, StorageException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, OffsetException, PermissionDeniedException; @ResponseWrapper(localName = "createRelationshipResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreateRelationshipResponse") @RequestWrapper(localName = "createRelationship", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CreateRelationship") @WebResult(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod public java.lang.String createRelationship( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "typeId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String typeId, - @WebParam(name = "propertyCollection", targetNamespace = "http://www.cmis.org/ns/1.0") - org.alfresco.repo.cmis.ws.RelationshipObjectType propertyCollection, + @WebParam(name = "properties", targetNamespace = "http://www.cmis.org/ns/1.0") + org.alfresco.repo.cmis.ws.PropertiesType properties, @WebParam(name = "sourceObjectId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String sourceObjectId, @WebParam(name = "targetObjectId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String targetObjectId - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "setContentStreamResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -132,15 +157,17 @@ public interface ObjectServicePort { public org.alfresco.repo.cmis.ws.SetContentStreamResponse setContentStream( @WebParam(partName = "parameters", name = "setContentStream", targetNamespace = "http://www.cmis.org/ns/1.0") SetContentStream parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, AlreadyExistsException, ObjectNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, StorageException, ContentAlreadyExistsException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, PermissionDeniedException; @ResponseWrapper(localName = "deleteObjectResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteObjectResponse") @RequestWrapper(localName = "deleteObject", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteObject") @WebMethod public void deleteObject( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") java.lang.String objectId - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "getPropertiesResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @@ -148,5 +175,5 @@ public interface ObjectServicePort { public org.alfresco.repo.cmis.ws.GetPropertiesResponse getProperties( @WebParam(partName = "parameters", name = "getProperties", targetNamespace = "http://www.cmis.org/ns/1.0") GetProperties parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectType.java new file mode 100755 index 0000000000..3b9d595857 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectType.java @@ -0,0 +1,90 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for objectType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="objectType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType" minOccurs="0"/>
+ *         <element name="allowableActions" type="{http://www.cmis.org/ns/1.0}allowableActionsType" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "objectType", propOrder = { + "properties", + "allowableActions" +}) +public class ObjectType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected PropertiesType properties; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected AllowableActionsType allowableActions; + + /** + * Gets the value of the properties property. + * + * @return + * possible object is + * {@link PropertiesType } + * + */ + public PropertiesType getProperties() { + return properties; + } + + /** + * Sets the value of the properties property. + * + * @param value + * allowed object is + * {@link PropertiesType } + * + */ + public void setProperties(PropertiesType value) { + this.properties = value; + } + + /** + * Gets the value of the allowableActions property. + * + * @return + * possible object is + * {@link AllowableActionsType } + * + */ + public AllowableActionsType getAllowableActions() { + return allowableActions; + } + + /** + * Sets the value of the allowableActions property. + * + * @param value + * allowed object is + * {@link AllowableActionsType } + * + */ + public void setAllowableActions(AllowableActionsType value) { + this.allowableActions = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeBase.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeBase.java deleted file mode 100644 index 0cc19bb753..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeBase.java +++ /dev/null @@ -1,287 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.datatype.XMLGregorianCalendar; - - -/** - *

Java class for objectTypeBase complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="objectTypeBase">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="objectID" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/>
- *         <element name="uri" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
- *         <element name="objectTypeID" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/>
- *         <element name="baseObjectType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="createdBy" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="creationDate" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="lastModifiedBy" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="lastModificationDate" type="{http://www.w3.org/2001/XMLSchema}dateTime" minOccurs="0"/>
- *         <element name="changeToken" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "objectTypeBase", propOrder = { - "objectID", - "uri", - "objectTypeID", - "baseObjectType", - "createdBy", - "creationDate", - "lastModifiedBy", - "lastModificationDate", - "changeToken" -}) -public abstract class ObjectTypeBase { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String objectID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String uri; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String objectTypeID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String baseObjectType; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String createdBy; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected XMLGregorianCalendar creationDate; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String lastModifiedBy; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected XMLGregorianCalendar lastModificationDate; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String changeToken; - - /** - * Gets the value of the objectID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getObjectID() { - return objectID; - } - - /** - * Sets the value of the objectID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setObjectID(String value) { - this.objectID = value; - } - - /** - * Gets the value of the uri property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getUri() { - return uri; - } - - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setUri(String value) { - this.uri = value; - } - - /** - * Gets the value of the objectTypeID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getObjectTypeID() { - return objectTypeID; - } - - /** - * Sets the value of the objectTypeID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setObjectTypeID(String value) { - this.objectTypeID = value; - } - - /** - * Gets the value of the baseObjectType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBaseObjectType() { - return baseObjectType; - } - - /** - * Sets the value of the baseObjectType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBaseObjectType(String value) { - this.baseObjectType = value; - } - - /** - * Gets the value of the createdBy property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCreatedBy() { - return createdBy; - } - - /** - * Sets the value of the createdBy property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCreatedBy(String value) { - this.createdBy = value; - } - - /** - * Gets the value of the creationDate property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getCreationDate() { - return creationDate; - } - - /** - * Sets the value of the creationDate property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setCreationDate(XMLGregorianCalendar value) { - this.creationDate = value; - } - - /** - * Gets the value of the lastModifiedBy property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLastModifiedBy() { - return lastModifiedBy; - } - - /** - * Sets the value of the lastModifiedBy property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLastModifiedBy(String value) { - this.lastModifiedBy = value; - } - - /** - * Gets the value of the lastModificationDate property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getLastModificationDate() { - return lastModificationDate; - } - - /** - * Sets the value of the lastModificationDate property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setLastModificationDate(XMLGregorianCalendar value) { - this.lastModificationDate = value; - } - - /** - * Gets the value of the changeToken property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getChangeToken() { - return changeToken; - } - - /** - * Sets the value of the changeToken property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setChangeToken(String value) { - this.changeToken = value; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeDefinitionType.java b/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeDefinitionType.java index 858a011c01..ea31535a4e 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeDefinitionType.java +++ b/source/generated/org/alfresco/repo/cmis/ws/ObjectTypeDefinitionType.java @@ -20,14 +20,19 @@ import javax.xml.bind.annotation.XmlType; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="objectTypeID" type="{http://www.cmis.org/ns/1.0}ID"/> - * <element name="objectTypeName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="parentTypeName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="rootTypeName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="objectTypeQueryName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="objectTypeDisplayName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="parentTypeID" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/> + * <element name="rootTypeQueryName" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="queryable" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> - * <element name="versionable" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> - * <element name="constraints" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> + * <element name="creatable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="fileable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="queryable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="controllable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="versionable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * <element name="contentStreamAllowed" type="{http://www.cmis.org/ns/1.0}contentStreamAllowedEnum"/> + * <element name="allowedSourceType" type="{http://www.cmis.org/ns/1.0}ID" maxOccurs="unbounded" minOccurs="0"/> + * <element name="allowedTargetType" type="{http://www.cmis.org/ns/1.0}ID" maxOccurs="unbounded" minOccurs="0"/> * <element name="property" type="{http://www.cmis.org/ns/1.0}propertyAttributesType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> @@ -40,14 +45,19 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "objectTypeDefinitionType", propOrder = { "objectTypeID", - "objectTypeName", - "displayName", - "parentTypeName", - "rootTypeName", + "objectTypeQueryName", + "objectTypeDisplayName", + "parentTypeID", + "rootTypeQueryName", "description", + "creatable", + "fileable", "queryable", + "controllable", "versionable", - "constraints", + "contentStreamAllowed", + "allowedSourceType", + "allowedTargetType", "property" }) public class ObjectTypeDefinitionType { @@ -55,21 +65,31 @@ public class ObjectTypeDefinitionType { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String objectTypeID; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String objectTypeName; + protected String objectTypeQueryName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String displayName; + protected String objectTypeDisplayName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String parentTypeName; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String rootTypeName; + protected String parentTypeID; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String rootTypeQueryName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String description; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean queryable; + protected boolean creatable; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected Boolean versionable; + protected boolean fileable; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected boolean queryable; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected boolean controllable; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected boolean versionable; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List constraints; + protected ContentStreamAllowedEnum contentStreamAllowed; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List allowedSourceType; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List allowedTargetType; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected List property; @@ -98,99 +118,99 @@ public class ObjectTypeDefinitionType { } /** - * Gets the value of the objectTypeName property. + * Gets the value of the objectTypeQueryName property. * * @return * possible object is * {@link String } * */ - public String getObjectTypeName() { - return objectTypeName; + public String getObjectTypeQueryName() { + return objectTypeQueryName; } /** - * Sets the value of the objectTypeName property. + * Sets the value of the objectTypeQueryName property. * * @param value * allowed object is * {@link String } * */ - public void setObjectTypeName(String value) { - this.objectTypeName = value; + public void setObjectTypeQueryName(String value) { + this.objectTypeQueryName = value; } /** - * Gets the value of the displayName property. + * Gets the value of the objectTypeDisplayName property. * * @return * possible object is * {@link String } * */ - public String getDisplayName() { - return displayName; + public String getObjectTypeDisplayName() { + return objectTypeDisplayName; } /** - * Sets the value of the displayName property. + * Sets the value of the objectTypeDisplayName property. * * @param value * allowed object is * {@link String } * */ - public void setDisplayName(String value) { - this.displayName = value; + public void setObjectTypeDisplayName(String value) { + this.objectTypeDisplayName = value; } /** - * Gets the value of the parentTypeName property. + * Gets the value of the parentTypeID property. * * @return * possible object is * {@link String } * */ - public String getParentTypeName() { - return parentTypeName; + public String getParentTypeID() { + return parentTypeID; } /** - * Sets the value of the parentTypeName property. + * Sets the value of the parentTypeID property. * * @param value * allowed object is * {@link String } * */ - public void setParentTypeName(String value) { - this.parentTypeName = value; + public void setParentTypeID(String value) { + this.parentTypeID = value; } /** - * Gets the value of the rootTypeName property. + * Gets the value of the rootTypeQueryName property. * * @return * possible object is * {@link String } * */ - public String getRootTypeName() { - return rootTypeName; + public String getRootTypeQueryName() { + return rootTypeQueryName; } /** - * Sets the value of the rootTypeName property. + * Sets the value of the rootTypeQueryName property. * * @param value * allowed object is * {@link String } * */ - public void setRootTypeName(String value) { - this.rootTypeName = value; + public void setRootTypeQueryName(String value) { + this.rootTypeQueryName = value; } /** @@ -217,67 +237,123 @@ public class ObjectTypeDefinitionType { this.description = value; } + /** + * Gets the value of the creatable property. + * + */ + public boolean isCreatable() { + return creatable; + } + + /** + * Sets the value of the creatable property. + * + */ + public void setCreatable(boolean value) { + this.creatable = value; + } + + /** + * Gets the value of the fileable property. + * + */ + public boolean isFileable() { + return fileable; + } + + /** + * Sets the value of the fileable property. + * + */ + public void setFileable(boolean value) { + this.fileable = value; + } + /** * Gets the value of the queryable property. * - * @return - * possible object is - * {@link Boolean } - * */ - public Boolean isQueryable() { + public boolean isQueryable() { return queryable; } /** * Sets the value of the queryable property. * - * @param value - * allowed object is - * {@link Boolean } - * */ - public void setQueryable(Boolean value) { + public void setQueryable(boolean value) { this.queryable = value; } + /** + * Gets the value of the controllable property. + * + */ + public boolean isControllable() { + return controllable; + } + + /** + * Sets the value of the controllable property. + * + */ + public void setControllable(boolean value) { + this.controllable = value; + } + /** * Gets the value of the versionable property. * - * @return - * possible object is - * {@link Boolean } - * */ - public Boolean isVersionable() { + public boolean isVersionable() { return versionable; } /** * Sets the value of the versionable property. * - * @param value - * allowed object is - * {@link Boolean } - * */ - public void setVersionable(Boolean value) { + public void setVersionable(boolean value) { this.versionable = value; } /** - * Gets the value of the constraints property. + * Gets the value of the contentStreamAllowed property. + * + * @return + * possible object is + * {@link ContentStreamAllowedEnum } + * + */ + public ContentStreamAllowedEnum getContentStreamAllowed() { + return contentStreamAllowed; + } + + /** + * Sets the value of the contentStreamAllowed property. + * + * @param value + * allowed object is + * {@link ContentStreamAllowedEnum } + * + */ + public void setContentStreamAllowed(ContentStreamAllowedEnum value) { + this.contentStreamAllowed = value; + } + + /** + * Gets the value of the allowedSourceType property. * *

* This accessor method returns a reference to the live list, * not a snapshot. Therefore any modification you make to the * returned list will be present inside the JAXB object. - * This is why there is not a set method for the constraints property. + * This is why there is not a set method for the allowedSourceType property. * *

* For example, to add a new item, do as follows: *

-     *    getConstraints().add(newItem);
+     *    getAllowedSourceType().add(newItem);
      * 
* * @@ -287,11 +363,40 @@ public class ObjectTypeDefinitionType { * * */ - public List getConstraints() { - if (constraints == null) { - constraints = new ArrayList(); + public List getAllowedSourceType() { + if (allowedSourceType == null) { + allowedSourceType = new ArrayList(); } - return this.constraints; + return this.allowedSourceType; + } + + /** + * Gets the value of the allowedTargetType property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the allowedTargetType property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getAllowedTargetType().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getAllowedTargetType() { + if (allowedTargetType == null) { + allowedTargetType = new ArrayList(); + } + return this.allowedTargetType; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/OffsetException.java b/source/generated/org/alfresco/repo/cmis/ws/OffsetException.java index 1ac3cb2343..7c68657f69 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/OffsetException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/OffsetException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 + * Tue Jul 29 18:21:47 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "OffsetFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "offsetException", targetNamespace = "http://www.cmis.org/ns/1.0") public class OffsetException extends Exception { - public static final long serialVersionUID = 20080527141113L; + public static final long serialVersionUID = 20080729182147L; - private org.alfresco.repo.cmis.ws.BasicFault offsetFault; + private org.alfresco.repo.cmis.ws.BasicFault offsetException; public OffsetException() { super(); @@ -30,17 +30,17 @@ public class OffsetException extends Exception { super(message, cause); } - public OffsetException(String message, org.alfresco.repo.cmis.ws.BasicFault offsetFault) { + public OffsetException(String message, org.alfresco.repo.cmis.ws.BasicFault offsetException) { super(message); - this.offsetFault = offsetFault; + this.offsetException = offsetException; } - public OffsetException(String message, org.alfresco.repo.cmis.ws.BasicFault offsetFault, Throwable cause) { + public OffsetException(String message, org.alfresco.repo.cmis.ws.BasicFault offsetException, Throwable cause) { super(message, cause); - this.offsetFault = offsetFault; + this.offsetException = offsetException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.offsetFault; + return this.offsetException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/OperationNotSupportedException.java b/source/generated/org/alfresco/repo/cmis/ws/OperationNotSupportedException.java index ea1e0d5009..cb06dd9e0d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/OperationNotSupportedException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/OperationNotSupportedException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "OperationNotSupportedFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "operationNotSupportedException", targetNamespace = "http://www.cmis.org/ns/1.0") public class OperationNotSupportedException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedFault; + private org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedException; public OperationNotSupportedException() { super(); @@ -30,17 +30,17 @@ public class OperationNotSupportedException extends Exception { super(message, cause); } - public OperationNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedFault) { + public OperationNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedException) { super(message); - this.operationNotSupportedFault = operationNotSupportedFault; + this.operationNotSupportedException = operationNotSupportedException; } - public OperationNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedFault, Throwable cause) { + public OperationNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault operationNotSupportedException, Throwable cause) { super(message, cause); - this.operationNotSupportedFault = operationNotSupportedFault; + this.operationNotSupportedException = operationNotSupportedException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.operationNotSupportedFault; + return this.operationNotSupportedException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/PermissionDeniedException.java b/source/generated/org/alfresco/repo/cmis/ws/PermissionDeniedException.java index 8c90f2468f..a253cc18b4 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/PermissionDeniedException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/PermissionDeniedException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "PermissionDeniedFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "permissionDeniedException", targetNamespace = "http://www.cmis.org/ns/1.0") public class PermissionDeniedException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault permissionDeniedFault; + private org.alfresco.repo.cmis.ws.BasicFault permissionDeniedException; public PermissionDeniedException() { super(); @@ -30,17 +30,17 @@ public class PermissionDeniedException extends Exception { super(message, cause); } - public PermissionDeniedException(String message, org.alfresco.repo.cmis.ws.BasicFault permissionDeniedFault) { + public PermissionDeniedException(String message, org.alfresco.repo.cmis.ws.BasicFault permissionDeniedException) { super(message); - this.permissionDeniedFault = permissionDeniedFault; + this.permissionDeniedException = permissionDeniedException; } - public PermissionDeniedException(String message, org.alfresco.repo.cmis.ws.BasicFault permissionDeniedFault, Throwable cause) { + public PermissionDeniedException(String message, org.alfresco.repo.cmis.ws.BasicFault permissionDeniedException, Throwable cause) { super(message, cause); - this.permissionDeniedFault = permissionDeniedFault; + this.permissionDeniedException = permissionDeniedException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.permissionDeniedFault; + return this.permissionDeniedException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/PolicyService.java b/source/generated/org/alfresco/repo/cmis/ws/PolicyService.java new file mode 100755 index 0000000000..0b209abc14 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PolicyService.java @@ -0,0 +1,58 @@ + +package org.alfresco.repo.cmis.ws; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import org.alfresco.repo.cmis.ws.PolicyServicePort; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:29 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebServiceClient(name = "PolicyService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/PolicyService.wsdl") +public class PolicyService extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://www.cmis.org/ns/1.0", "PolicyService"); + public final static QName PolicyServicePort = new QName("http://www.cmis.org/ns/1.0", "PolicyServicePort"); + static { + URL url = null; + try { + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/PolicyService.wsdl"); + } catch (MalformedURLException e) { + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/PolicyService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public PolicyService(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public PolicyService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public PolicyService() { + super(WSDL_LOCATION, SERVICE); + } + + /** + * + * @return + * returns PolicyServicePort + */ + @WebEndpoint(name = "PolicyServicePort") + public PolicyServicePort getPolicyServicePort() { + return super.getPort(PolicyServicePort, PolicyServicePort.class); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PolicyServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/PolicyServicePort.java new file mode 100755 index 0000000000..d01b608ea3 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PolicyServicePort.java @@ -0,0 +1,55 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:29 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebService(targetNamespace = "http://www.cmis.org/ns/1.0", name = "PolicyServicePort") + +public interface PolicyServicePort { + + @ResponseWrapper(localName = "removePolicyResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.RemovePolicyResponse") + @RequestWrapper(localName = "removePolicy", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.RemovePolicy") + @WebMethod + public void removePolicy( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(name = "policyId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String policyId, + @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String objectId + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; + + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + @WebResult(name = "getAppliedPoliciesResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") + @WebMethod + public org.alfresco.repo.cmis.ws.GetAppliedPoliciesResponse getAppliedPolicies( + @WebParam(partName = "parameters", name = "getAppliedPolicies", targetNamespace = "http://www.cmis.org/ns/1.0") + GetAppliedPolicies parameters + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; + + @ResponseWrapper(localName = "applyPolicyResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.ApplyPolicyResponse") + @RequestWrapper(localName = "applyPolicy", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.ApplyPolicy") + @WebMethod + public void applyPolicy( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, + @WebParam(name = "policyId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String policyId, + @WebParam(name = "objectId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String objectId + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertiesType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertiesType.java new file mode 100755 index 0000000000..0483579715 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertiesType.java @@ -0,0 +1,333 @@ + +package org.alfresco.repo.cmis.ws; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for propertiesType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertiesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="propertyBoolean" type="{http://www.cmis.org/ns/1.0}propertyBooleanType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyDateTime" type="{http://www.cmis.org/ns/1.0}propertyDateTimeType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyDecimal" type="{http://www.cmis.org/ns/1.0}propertyDecimalType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyHTML" type="{http://www.cmis.org/ns/1.0}propertyHTMLType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyID" type="{http://www.cmis.org/ns/1.0}propertyIDType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyInteger" type="{http://www.cmis.org/ns/1.0}propertyIntegerType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyString" type="{http://www.cmis.org/ns/1.0}propertyStringType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyURI" type="{http://www.cmis.org/ns/1.0}propertyURIType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="propertyXML" type="{http://www.cmis.org/ns/1.0}propertyXMLType" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertiesType", propOrder = { + "propertyBoolean", + "propertyDateTime", + "propertyDecimal", + "propertyHTML", + "propertyID", + "propertyInteger", + "propertyString", + "propertyURI", + "propertyXML" +}) +public class PropertiesType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyBoolean; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyDateTime; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyDecimal; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyHTML; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyID; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyInteger; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyString; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyURI; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List propertyXML; + + /** + * Gets the value of the propertyBoolean property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyBoolean property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyBoolean().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyBooleanType } + * + * + */ + public List getPropertyBoolean() { + if (propertyBoolean == null) { + propertyBoolean = new ArrayList(); + } + return this.propertyBoolean; + } + + /** + * Gets the value of the propertyDateTime property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyDateTime property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyDateTime().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyDateTimeType } + * + * + */ + public List getPropertyDateTime() { + if (propertyDateTime == null) { + propertyDateTime = new ArrayList(); + } + return this.propertyDateTime; + } + + /** + * Gets the value of the propertyDecimal property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyDecimal property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyDecimal().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyDecimalType } + * + * + */ + public List getPropertyDecimal() { + if (propertyDecimal == null) { + propertyDecimal = new ArrayList(); + } + return this.propertyDecimal; + } + + /** + * Gets the value of the propertyHTML property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyHTML property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyHTML().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyHTMLType } + * + * + */ + public List getPropertyHTML() { + if (propertyHTML == null) { + propertyHTML = new ArrayList(); + } + return this.propertyHTML; + } + + /** + * Gets the value of the propertyID property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyID property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyID().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyIDType } + * + * + */ + public List getPropertyID() { + if (propertyID == null) { + propertyID = new ArrayList(); + } + return this.propertyID; + } + + /** + * Gets the value of the propertyInteger property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyInteger property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyInteger().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyIntegerType } + * + * + */ + public List getPropertyInteger() { + if (propertyInteger == null) { + propertyInteger = new ArrayList(); + } + return this.propertyInteger; + } + + /** + * Gets the value of the propertyString property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyString property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyString().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyStringType } + * + * + */ + public List getPropertyString() { + if (propertyString == null) { + propertyString = new ArrayList(); + } + return this.propertyString; + } + + /** + * Gets the value of the propertyURI property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyURI property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyURI().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyURIType } + * + * + */ + public List getPropertyURI() { + if (propertyURI == null) { + propertyURI = new ArrayList(); + } + return this.propertyURI; + } + + /** + * Gets the value of the propertyXML property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the propertyXML property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getPropertyXML().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link PropertyXMLType } + * + * + */ + public List getPropertyXML() { + if (propertyXML == null) { + propertyXML = new ArrayList(); + } + return this.propertyXML; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyAttributesType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyAttributesType.java index 2c87216fea..d68b7735df 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/PropertyAttributesType.java +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyAttributesType.java @@ -12,21 +12,26 @@ import javax.xml.bind.annotation.XmlType; /** *

Java class for propertyAttributesType complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * *

  * <complexType name="propertyAttributesType">
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="propertyName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="propertyId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *         <element name="displayName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="description" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="propertyType" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="isInherited" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         <element name="propertyType" type="{http://www.cmis.org/ns/1.0}propertyTypeEnum"/>
  *         <element name="cardinality" type="{http://www.cmis.org/ns/1.0}cardinalityEnum"/>
- *         <element name="maximumLength" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="maximumLength" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         <element name="schemaURI" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         <element name="encoding" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="choice" type="{http://www.cmis.org/ns/1.0}choiceType" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="openChoice" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="required" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="defaultValue" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="updatability" type="{http://www.cmis.org/ns/1.0}updatabilityEnum"/>
@@ -37,18 +42,22 @@ import javax.xml.bind.annotation.XmlType;
  *   </complexContent>
  * </complexType>
  * 
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "propertyAttributesType", propOrder = { "propertyName", + "propertyId", "displayName", "description", + "isInherited", "propertyType", "cardinality", "maximumLength", - "choice", + "schemaURI", + "encoding", + "openChoice", "required", "defaultValue", "updatability", @@ -60,17 +69,25 @@ public class PropertyAttributesType { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String propertyName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String propertyId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String displayName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String description; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected boolean isInherited; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String propertyType; + protected PropertyTypeEnum propertyType; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected CardinalityEnum cardinality; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger maximumLength; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List choice; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String schemaURI; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String encoding; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean openChoice; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected boolean required; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") @@ -84,11 +101,11 @@ public class PropertyAttributesType { /** * Gets the value of the propertyName property. - * + * * @return * possible object is * {@link String } - * + * */ public String getPropertyName() { return propertyName; @@ -96,23 +113,47 @@ public class PropertyAttributesType { /** * Sets the value of the propertyName property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setPropertyName(String value) { this.propertyName = value; } /** - * Gets the value of the displayName property. - * + * Gets the value of the propertyId property. + * * @return * possible object is * {@link String } - * + * + */ + public String getPropertyId() { + return propertyId; + } + + /** + * Sets the value of the propertyId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPropertyId(String value) { + this.propertyId = value; + } + + /** + * Gets the value of the displayName property. + * + * @return + * possible object is + * {@link String } + * */ public String getDisplayName() { return displayName; @@ -120,11 +161,11 @@ public class PropertyAttributesType { /** * Sets the value of the displayName property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setDisplayName(String value) { this.displayName = value; @@ -132,11 +173,11 @@ public class PropertyAttributesType { /** * Gets the value of the description property. - * + * * @return * possible object is * {@link String } - * + * */ public String getDescription() { return description; @@ -144,47 +185,63 @@ public class PropertyAttributesType { /** * Sets the value of the description property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setDescription(String value) { this.description = value; } + /** + * Gets the value of the isInherited property. + * + */ + public boolean isIsInherited() { + return isInherited; + } + + /** + * Sets the value of the isInherited property. + * + */ + public void setIsInherited(boolean value) { + this.isInherited = value; + } + /** * Gets the value of the propertyType property. - * + * * @return * possible object is - * {@link String } - * + * {@link PropertyTypeEnum } + * */ - public String getPropertyType() { + public PropertyTypeEnum getPropertyType() { return propertyType; } /** * Sets the value of the propertyType property. - * + * * @param value * allowed object is - * {@link String } - * + * {@link PropertyTypeEnum } + * */ - public void setPropertyType(String value) { + public void setPropertyType(PropertyTypeEnum value) { this.propertyType = value; } /** * Gets the value of the cardinality property. - * + * * @return * possible object is * {@link CardinalityEnum } - * + * */ public CardinalityEnum getCardinality() { return cardinality; @@ -192,11 +249,11 @@ public class PropertyAttributesType { /** * Sets the value of the cardinality property. - * + * * @param value * allowed object is * {@link CardinalityEnum } - * + * */ public void setCardinality(CardinalityEnum value) { this.cardinality = value; @@ -204,11 +261,11 @@ public class PropertyAttributesType { /** * Gets the value of the maximumLength property. - * + * * @return * possible object is * {@link BigInteger } - * + * */ public BigInteger getMaximumLength() { return maximumLength; @@ -216,48 +273,91 @@ public class PropertyAttributesType { /** * Sets the value of the maximumLength property. - * + * * @param value * allowed object is * {@link BigInteger } - * + * */ public void setMaximumLength(BigInteger value) { this.maximumLength = value; } /** - * Gets the value of the choice property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the choice property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getChoice().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ChoiceType } - * - * + * Gets the value of the schemaURI property. + * + * @return + * possible object is + * {@link String } + * */ - public List getChoice() { - if (choice == null) { - choice = new ArrayList(); - } - return this.choice; + public String getSchemaURI() { + return schemaURI; + } + + /** + * Sets the value of the schemaURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSchemaURI(String value) { + this.schemaURI = value; + } + + /** + * Gets the value of the encoding property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEncoding() { + return encoding; + } + + /** + * Sets the value of the encoding property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEncoding(String value) { + this.encoding = value; + } + + /** + * Gets the value of the openChoice property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isOpenChoice() { + return openChoice; + } + + /** + * Sets the value of the openChoice property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setOpenChoice(Boolean value) { + this.openChoice = value; } /** * Gets the value of the required property. - * + * */ public boolean isRequired() { return required; @@ -265,7 +365,7 @@ public class PropertyAttributesType { /** * Sets the value of the required property. - * + * */ public void setRequired(boolean value) { this.required = value; @@ -273,11 +373,11 @@ public class PropertyAttributesType { /** * Gets the value of the defaultValue property. - * + * * @return * possible object is * {@link String } - * + * */ public String getDefaultValue() { return defaultValue; @@ -285,11 +385,11 @@ public class PropertyAttributesType { /** * Sets the value of the defaultValue property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setDefaultValue(String value) { this.defaultValue = value; @@ -297,11 +397,11 @@ public class PropertyAttributesType { /** * Gets the value of the updatability property. - * + * * @return * possible object is * {@link UpdatabilityEnum } - * + * */ public UpdatabilityEnum getUpdatability() { return updatability; @@ -309,11 +409,11 @@ public class PropertyAttributesType { /** * Sets the value of the updatability property. - * + * * @param value * allowed object is * {@link UpdatabilityEnum } - * + * */ public void setUpdatability(UpdatabilityEnum value) { this.updatability = value; @@ -321,7 +421,7 @@ public class PropertyAttributesType { /** * Gets the value of the queryable property. - * + * */ public boolean isQueryable() { return queryable; @@ -329,7 +429,7 @@ public class PropertyAttributesType { /** * Sets the value of the queryable property. - * + * */ public void setQueryable(boolean value) { this.queryable = value; @@ -337,7 +437,7 @@ public class PropertyAttributesType { /** * Gets the value of the orderable property. - * + * */ public boolean isOrderable() { return orderable; @@ -345,7 +445,7 @@ public class PropertyAttributesType { /** * Sets the value of the orderable property. - * + * */ public void setOrderable(boolean value) { this.orderable = value; diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyBooleanType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyBooleanType.java new file mode 100755 index 0000000000..408f5f6f35 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyBooleanType.java @@ -0,0 +1,107 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for propertyBooleanType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyBooleanType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>boolean">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyBooleanType", propOrder = { + "value" +}) +public class PropertyBooleanType { + + @XmlValue + protected boolean value; + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the value property. + * + */ + public boolean isValue() { + return value; + } + + /** + * Sets the value of the value property. + * + */ + public void setValue(boolean value) { + this.value = value; + } + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyDateTimeType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyDateTimeType.java new file mode 100755 index 0000000000..59e141d239 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyDateTimeType.java @@ -0,0 +1,116 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + *

Java class for propertyDateTimeType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyDateTimeType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>dateTime">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyDateTimeType", propOrder = { + "value" +}) +public class PropertyDateTimeType { + + @XmlValue + protected XMLGregorianCalendar value; + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setValue(XMLGregorianCalendar value) { + this.value = value; + } + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyDecimalType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyDecimalType.java new file mode 100755 index 0000000000..9d4193fe20 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyDecimalType.java @@ -0,0 +1,116 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigDecimal; +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for propertyDecimalType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyDecimalType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>decimal">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyDecimalType", propOrder = { + "value" +}) +public class PropertyDecimalType { + + @XmlValue + protected BigDecimal value; + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link BigDecimal } + * + */ + public BigDecimal getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link BigDecimal } + * + */ + public void setValue(BigDecimal value) { + this.value = value; + } + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyHTMLType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyHTMLType.java new file mode 100755 index 0000000000..1a8f59437b --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyHTMLType.java @@ -0,0 +1,88 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for propertyHTMLType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyHTMLType">
+ *   <complexContent>
+ *     <extension base="{http://www.cmis.org/ns/1.0}HTML">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyHTMLType") +public class PropertyHTMLType + extends HTML +{ + + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/Property.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyIDType.java old mode 100644 new mode 100755 similarity index 56% rename from source/generated/org/alfresco/repo/cmis/ws/Property.java rename to source/generated/org/alfresco/repo/cmis/ws/PropertyIDType.java index 237debb7c2..34b2197bf8 --- a/source/generated/org/alfresco/repo/cmis/ws/Property.java +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyIDType.java @@ -1,70 +1,67 @@ package org.alfresco.repo.cmis.ws; +import java.math.BigInteger; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; /** - *

Java class for property element declaration. + *

Java class for propertyIDType complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="property">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *         <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
+ * <complexType name="propertyIDType">
+ *   <simpleContent>
+ *     <extension base="<http://www.cmis.org/ns/1.0>ID">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
  * 
* * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "content" +@XmlType(name = "propertyIDType", propOrder = { + "value" }) -@XmlRootElement(name = "property") -public class Property { +public class PropertyIDType { @XmlValue - protected String content; + protected String value; @XmlAttribute - protected String index; + protected BigInteger index; @XmlAttribute(required = true) protected String name; /** - * Gets the value of the content property. + * Gets the value of the value property. * * @return * possible object is * {@link String } * */ - public String getContent() { - return content; + public String getValue() { + return value; } /** - * Sets the value of the content property. + * Sets the value of the value property. * * @param value * allowed object is * {@link String } * */ - public void setContent(String value) { - this.content = value; + public void setValue(String value) { + this.value = value; } /** @@ -72,10 +69,10 @@ public class Property { * * @return * possible object is - * {@link String } + * {@link BigInteger } * */ - public String getIndex() { + public BigInteger getIndex() { return index; } @@ -84,10 +81,10 @@ public class Property { * * @param value * allowed object is - * {@link String } + * {@link BigInteger } * */ - public void setIndex(String value) { + public void setIndex(BigInteger value) { this.index = value; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyIntegerType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyIntegerType.java new file mode 100755 index 0000000000..d2b1bb58ad --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyIntegerType.java @@ -0,0 +1,115 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for propertyIntegerType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyIntegerType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>integer">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyIntegerType", propOrder = { + "value" +}) +public class PropertyIntegerType { + + @XmlValue + protected BigInteger value; + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setValue(BigInteger value) { + this.value = value; + } + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/ChoiceType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyStringType.java old mode 100644 new mode 100755 similarity index 71% rename from source/generated/org/alfresco/repo/cmis/ws/ChoiceType.java rename to source/generated/org/alfresco/repo/cmis/ws/PropertyStringType.java index 339fa54182..ddf124d76d --- a/source/generated/org/alfresco/repo/cmis/ws/ChoiceType.java +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyStringType.java @@ -10,16 +10,16 @@ import javax.xml.bind.annotation.XmlValue; /** - *

Java class for choiceType complex type. + *

Java class for propertyStringType complex type. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <complexType name="choiceType">
+ * <complexType name="propertyStringType">
  *   <simpleContent>
  *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     </extension>
  *   </simpleContent>
  * </complexType>
@@ -28,17 +28,17 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "choiceType", propOrder = {
+@XmlType(name = "propertyStringType", propOrder = {
     "value"
 })
-public class ChoiceType {
+public class PropertyStringType {
 
     @XmlValue
     protected String value;
-    @XmlAttribute(required = true)
+    @XmlAttribute
     protected BigInteger index;
     @XmlAttribute(required = true)
-    protected String key;
+    protected String name;
 
     /**
      * Gets the value of the value property.
@@ -89,27 +89,27 @@ public class ChoiceType {
     }
 
     /**
-     * Gets the value of the key property.
+     * Gets the value of the name property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getKey() {
-        return key;
+    public String getName() {
+        return name;
     }
 
     /**
-     * Sets the value of the key property.
+     * Sets the value of the name property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setKey(String value) {
-        this.key = value;
+    public void setName(String value) {
+        this.name = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyTypeEnum.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyTypeEnum.java
new file mode 100755
index 0000000000..586521c8da
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyTypeEnum.java
@@ -0,0 +1,66 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+
+
+/**
+ * 

Java class for propertyTypeEnum. + * + *

The following schema fragment specifies the expected content contained within this class. + *

+ *

+ * <simpleType name="propertyTypeEnum">
+ *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     <enumeration value="String"/>
+ *     <enumeration value="Decimal"/>
+ *     <enumeration value="Integer"/>
+ *     <enumeration value="Boolean"/>
+ *     <enumeration value="DateTime"/>
+ *     <enumeration value="URI"/>
+ *     <enumeration value="ID"/>
+ *     <enumeration value="XML"/>
+ *     <enumeration value="HTML"/>
+ *   </restriction>
+ * </simpleType>
+ * 
+ * + */ +@XmlEnum +public enum PropertyTypeEnum { + + @XmlEnumValue("Boolean") + BOOLEAN("Boolean"), + @XmlEnumValue("DateTime") + DATE_TIME("DateTime"), + @XmlEnumValue("Decimal") + DECIMAL("Decimal"), + HTML("HTML"), + ID("ID"), + @XmlEnumValue("Integer") + INTEGER("Integer"), + @XmlEnumValue("String") + STRING("String"), + URI("URI"), + XML("XML"); + private final String value; + + PropertyTypeEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + public static PropertyTypeEnum fromValue(String v) { + for (PropertyTypeEnum c: PropertyTypeEnum.values()) { + if (c.value.equals(v)) { + return c; + } + } + throw new IllegalArgumentException(v.toString()); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyURIType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyURIType.java new file mode 100755 index 0000000000..251e054e14 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyURIType.java @@ -0,0 +1,115 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlValue; + + +/** + *

Java class for propertyURIType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyURIType">
+ *   <simpleContent>
+ *     <extension base="<http://www.w3.org/2001/XMLSchema>anyURI">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </simpleContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyURIType", propOrder = { + "value" +}) +public class PropertyURIType { + + @XmlValue + protected String value; + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/PropertyXMLType.java b/source/generated/org/alfresco/repo/cmis/ws/PropertyXMLType.java new file mode 100755 index 0000000000..d95c40f6eb --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/PropertyXMLType.java @@ -0,0 +1,88 @@ + +package org.alfresco.repo.cmis.ws; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for propertyXMLType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="propertyXMLType">
+ *   <complexContent>
+ *     <extension base="{http://www.cmis.org/ns/1.0}XML">
+ *       <attribute name="index" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </extension>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "propertyXMLType") +public class PropertyXMLType + extends XML +{ + + @XmlAttribute + protected BigInteger index; + @XmlAttribute(required = true) + protected String name; + + /** + * Gets the value of the index property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIndex() { + return index; + } + + /** + * Sets the value of the index property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIndex(BigInteger value) { + this.index = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/Query.java b/source/generated/org/alfresco/repo/cmis/ws/Query.java index d45e157401..1bbd9e69a4 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/Query.java +++ b/source/generated/org/alfresco/repo/cmis/ws/Query.java @@ -20,8 +20,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="statement" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="searchAllVersions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <element name="includeAllowableActions" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}maxItems" minOccurs="0"/> * <element ref="{http://www.cmis.org/ns/1.0}skipCount" minOccurs="0"/> * </sequence> @@ -35,23 +37,53 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "statement", "searchAllVersions", + "includeAllowableActions", "maxItems", "skipCount" }) @XmlRootElement(name = "query") public class Query { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String statement; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected Boolean searchAllVersions; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected Boolean includeAllowableActions; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger maxItems; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected BigInteger skipCount; + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + /** * Gets the value of the statement property. * @@ -100,6 +132,30 @@ public class Query { this.searchAllVersions = value; } + /** + * Gets the value of the includeAllowableActions property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isIncludeAllowableActions() { + return includeAllowableActions; + } + + /** + * Sets the value of the includeAllowableActions property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setIncludeAllowableActions(Boolean value) { + this.includeAllowableActions = value; + } + /** * Gets the value of the maxItems property. * diff --git a/source/generated/org/alfresco/repo/cmis/ws/QueryResponse.java b/source/generated/org/alfresco/repo/cmis/ws/QueryResponse.java index cc5badb51a..e010cef90d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/QueryResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/QueryResponse.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element ref="{http://www.cmis.org/ns/1.0}documentAndFolderCollection"/> + * <element name="queryResults" type="{http://www.cmis.org/ns/1.0}objectCollectionType"/> * <element ref="{http://www.cmis.org/ns/1.0}hasMoreItems"/> * </sequence> * </restriction> @@ -32,39 +32,39 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "documentAndFolderCollection", + "queryResults", "hasMoreItems" }) @XmlRootElement(name = "queryResponse") public class QueryResponse { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected DocumentAndFolderCollection documentAndFolderCollection; + protected ObjectCollectionType queryResults; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected boolean hasMoreItems; /** - * Gets the value of the documentAndFolderCollection property. + * Gets the value of the queryResults property. * * @return * possible object is - * {@link DocumentAndFolderCollection } + * {@link ObjectCollectionType } * */ - public DocumentAndFolderCollection getDocumentAndFolderCollection() { - return documentAndFolderCollection; + public ObjectCollectionType getQueryResults() { + return queryResults; } /** - * Sets the value of the documentAndFolderCollection property. + * Sets the value of the queryResults property. * * @param value * allowed object is - * {@link DocumentAndFolderCollection } + * {@link ObjectCollectionType } * */ - public void setDocumentAndFolderCollection(DocumentAndFolderCollection value) { - this.documentAndFolderCollection = value; + public void setQueryResults(ObjectCollectionType value) { + this.queryResults = value; } /** diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelatedRepositoriesType.java b/source/generated/org/alfresco/repo/cmis/ws/RelatedRepositoriesType.java new file mode 100755 index 0000000000..66fc59a339 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RelatedRepositoriesType.java @@ -0,0 +1,146 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for relatedRepositoriesType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="relatedRepositoriesType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="repositoryID" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *         <element name="repositoryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="repositoryURI" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         <element name="repositoryRelationshipName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "relatedRepositoriesType", propOrder = { + "repositoryID", + "repositoryName", + "repositoryURI", + "repositoryRelationshipName" +}) +public class RelatedRepositoriesType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryID; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryName; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryURI; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected String repositoryRelationshipName; + + /** + * Gets the value of the repositoryID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryID() { + return repositoryID; + } + + /** + * Sets the value of the repositoryID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryID(String value) { + this.repositoryID = value; + } + + /** + * Gets the value of the repositoryName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryName() { + return repositoryName; + } + + /** + * Sets the value of the repositoryName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryName(String value) { + this.repositoryName = value; + } + + /** + * Gets the value of the repositoryURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryURI() { + return repositoryURI; + } + + /** + * Sets the value of the repositoryURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryURI(String value) { + this.repositoryURI = value; + } + + /** + * Gets the value of the repositoryRelationshipName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryRelationshipName() { + return repositoryRelationshipName; + } + + /** + * Sets the value of the repositoryRelationshipName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryRelationshipName(String value) { + this.repositoryRelationshipName = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelationshipCollection.java b/source/generated/org/alfresco/repo/cmis/ws/RelationshipCollection.java deleted file mode 100644 index 50f3e09879..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/RelationshipCollection.java +++ /dev/null @@ -1,73 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for relationshipCollection element declaration. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <element name="relationshipCollection">
- *   <complexType>
- *     <complexContent>
- *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *         <sequence>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}relationshipObjectType" maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </restriction>
- *     </complexContent>
- *   </complexType>
- * </element>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "object" -}) -@XmlRootElement(name = "relationshipCollection") -public class RelationshipCollection { - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List object; - - /** - * Gets the value of the object property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the object property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getObject().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link RelationshipObjectType } - * - * - */ - public List getObject() { - if (object == null) { - object = new ArrayList(); - } - return this.object; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelationshipDirectionEnum.java b/source/generated/org/alfresco/repo/cmis/ws/RelationshipDirectionEnum.java index cc5588d979..c3d79b16b1 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/RelationshipDirectionEnum.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RelationshipDirectionEnum.java @@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlEnumValue; * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> * <enumeration value="source"/> * <enumeration value="target"/> - * <enumeration value="sourceAndTarget"/> + * <enumeration value="either"/> * </restriction> * </simpleType> *

@@ -24,10 +24,10 @@ import javax.xml.bind.annotation.XmlEnumValue; @XmlEnum public enum RelationshipDirectionEnum { + @XmlEnumValue("either") + EITHER("either"), @XmlEnumValue("source") SOURCE("source"), - @XmlEnumValue("sourceAndTarget") - SOURCE_AND_TARGET("sourceAndTarget"), @XmlEnumValue("target") TARGET("target"); private final String value; diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelationshipObjectType.java b/source/generated/org/alfresco/repo/cmis/ws/RelationshipObjectType.java deleted file mode 100644 index ec237cee1f..0000000000 --- a/source/generated/org/alfresco/repo/cmis/ws/RelationshipObjectType.java +++ /dev/null @@ -1,127 +0,0 @@ - -package org.alfresco.repo.cmis.ws; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for relationshipObjectType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="relationshipObjectType">
- *   <complexContent>
- *     <extension base="{http://www.cmis.org/ns/1.0}objectTypeBase">
- *       <sequence>
- *         <element ref="{http://www.cmis.org/ns/1.0}sourceOID" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}targetOID" minOccurs="0"/>
- *         <element ref="{http://www.cmis.org/ns/1.0}property" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "relationshipObjectType", propOrder = { - "sourceOID", - "targetOID", - "property" -}) -public class RelationshipObjectType - extends ObjectTypeBase -{ - - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String sourceOID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected String targetOID; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected List property; - - /** - * Gets the value of the sourceOID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getSourceOID() { - return sourceOID; - } - - /** - * Sets the value of the sourceOID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setSourceOID(String value) { - this.sourceOID = value; - } - - /** - * Gets the value of the targetOID property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTargetOID() { - return targetOID; - } - - /** - * Sets the value of the targetOID property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTargetOID(String value) { - this.targetOID = value; - } - - /** - * Gets the value of the property property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the property property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getProperty().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Property } - * - * - */ - public List getProperty() { - if (property == null) { - property = new ArrayList(); - } - return this.property; - } - -} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelationshipService.java b/source/generated/org/alfresco/repo/cmis/ws/RelationshipService.java new file mode 100755 index 0000000000..31137604d8 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RelationshipService.java @@ -0,0 +1,58 @@ + +package org.alfresco.repo.cmis.ws; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import org.alfresco.repo.cmis.ws.RelationshipServicePort; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:39 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebServiceClient(name = "RelationshipService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RelationshipService.wsdl") +public class RelationshipService extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://www.cmis.org/ns/1.0", "RelationshipService"); + public final static QName RelationshipServicePort = new QName("http://www.cmis.org/ns/1.0", "RelationshipServicePort"); + static { + URL url = null; + try { + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RelationshipService.wsdl"); + } catch (MalformedURLException e) { + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RelationshipService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public RelationshipService(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public RelationshipService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public RelationshipService() { + super(WSDL_LOCATION, SERVICE); + } + + /** + * + * @return + * returns RelationshipServicePort + */ + @WebEndpoint(name = "RelationshipServicePort") + public RelationshipServicePort getRelationshipServicePort() { + return super.getPort(RelationshipServicePort, RelationshipServicePort.class); + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RelationshipServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/RelationshipServicePort.java new file mode 100755 index 0000000000..91ce82548e --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RelationshipServicePort.java @@ -0,0 +1,30 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.ParameterStyle; + +/** + * This class was generated by Apache CXF 2.0.6 + * Tue Jul 29 18:22:39 EEST 2008 + * Generated source version: 2.0.6 + * + */ + +@WebService(targetNamespace = "http://www.cmis.org/ns/1.0", name = "RelationshipServicePort") +@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + +public interface RelationshipServicePort { + + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + @WebResult(name = "getRelationshipsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") + @WebMethod + public org.alfresco.repo.cmis.ws.GetRelationshipsResponse getRelationships( + @WebParam(partName = "parameters", name = "getRelationships", targetNamespace = "http://www.cmis.org/ns/1.0") + GetRelationships parameters + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolder.java b/source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolder.java old mode 100644 new mode 100755 similarity index 54% rename from source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolder.java rename to source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolder.java index 1778e59aac..aaf8ff6453 --- a/source/generated/org/alfresco/repo/cmis/ws/RemoveDocumentFromFolder.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolder.java @@ -9,18 +9,19 @@ import javax.xml.bind.annotation.XmlType; /** - *

Java class for removeDocumentFromFolder element declaration. + *

Java class for removeObjectFromFolder element declaration. * *

The following schema fragment specifies the expected content contained within this class. * *

- * <element name="removeDocumentFromFolder">
+ * <element name="removeObjectFromFolder">
  *   <complexType>
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/>
- *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}objectID" minOccurs="0"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="folderId" type="{http://www.cmis.org/ns/1.0}ID" minOccurs="0"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -32,39 +33,66 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
-    "documentId",
+    "repositoryId",
+    "objectId",
     "folderId"
 })
-@XmlRootElement(name = "removeDocumentFromFolder")
-public class RemoveDocumentFromFolder {
+@XmlRootElement(name = "removeObjectFromFolder")
+public class RemoveObjectFromFolder {
 
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected String documentId;
+    protected String repositoryId;
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String folderId;
 
     /**
-     * Gets the value of the documentId property.
+     * Gets the value of the repositoryId property.
      * 
      * @return
      *     possible object is
      *     {@link String }
      *     
      */
-    public String getDocumentId() {
-        return documentId;
+    public String getRepositoryId() {
+        return repositoryId;
     }
 
     /**
-     * Sets the value of the documentId property.
+     * Sets the value of the repositoryId property.
      * 
      * @param value
      *     allowed object is
      *     {@link String }
      *     
      */
-    public void setDocumentId(String value) {
-        this.documentId = value;
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
+
+    /**
+     * Gets the value of the objectId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * Sets the value of the objectId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setObjectId(String value) {
+        this.objectId = value;
     }
 
     /**
diff --git a/source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolderResponse.java b/source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolderResponse.java
new file mode 100755
index 0000000000..406b5271d4
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/RemoveObjectFromFolderResponse.java
@@ -0,0 +1,36 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 

Java class for removeObjectFromFolderResponse element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="removeObjectFromFolderResponse">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "removeObjectFromFolderResponse") +public class RemoveObjectFromFolderResponse { + + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RemovePolicy.java b/source/generated/org/alfresco/repo/cmis/ws/RemovePolicy.java new file mode 100755 index 0000000000..18a9a57c81 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RemovePolicy.java @@ -0,0 +1,122 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for removePolicy element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="removePolicy">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="policyId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "repositoryId", + "policyId", + "objectId" +}) +@XmlRootElement(name = "removePolicy") +public class RemovePolicy { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String policyId; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String objectId; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } + + /** + * Gets the value of the policyId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPolicyId() { + return policyId; + } + + /** + * Sets the value of the policyId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPolicyId(String value) { + this.policyId = value; + } + + /** + * Gets the value of the objectId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getObjectId() { + return objectId; + } + + /** + * Sets the value of the objectId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setObjectId(String value) { + this.objectId = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RemovePolicyResponse.java b/source/generated/org/alfresco/repo/cmis/ws/RemovePolicyResponse.java new file mode 100755 index 0000000000..f553ff6c0e --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RemovePolicyResponse.java @@ -0,0 +1,36 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for removePolicyResponse element declaration. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <element name="removePolicyResponse">
+ *   <complexType>
+ *     <complexContent>
+ *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *         <sequence>
+ *         </sequence>
+ *       </restriction>
+ *     </complexContent>
+ *   </complexType>
+ * </element>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "removePolicyResponse") +public class RemovePolicyResponse { + + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RepositoryInfoType.java b/source/generated/org/alfresco/repo/cmis/ws/RepositoryInfoType.java index 673c805a9a..a9e094fd64 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/RepositoryInfoType.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RepositoryInfoType.java @@ -1,6 +1,8 @@ package org.alfresco.repo.cmis.ws; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -17,15 +19,18 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="repositoryId" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="repositoryName" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="repositoryDescription" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="rootFolderId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="repositoryURI" type="{http://www.w3.org/2001/XMLSchema}anyURI"/> + * <element name="repositoryDescription" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="rootFolderId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="vendorName" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="productName" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="productVersion" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="repositorySpecificInformation" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="cmisVersionsSupported" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="repositorySpecificInformation" type="{http://www.cmis.org/ns/1.0}XML" minOccurs="0"/> * <element name="capabilities" type="{http://www.cmis.org/ns/1.0}capabilitiesType"/> + * <element name="relatedRepositories" type="{http://www.cmis.org/ns/1.0}relatedRepositoriesType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -38,13 +43,16 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "repositoryInfoType", propOrder = { "repositoryId", "repositoryName", + "repositoryURI", "repositoryDescription", "rootFolderId", "vendorName", "productName", "productVersion", + "cmisVersionsSupported", "repositorySpecificInformation", - "capabilities" + "capabilities", + "relatedRepositories" }) public class RepositoryInfoType { @@ -53,6 +61,8 @@ public class RepositoryInfoType { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String repositoryName; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryURI; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected String repositoryDescription; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String rootFolderId; @@ -63,9 +73,13 @@ public class RepositoryInfoType { @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String productVersion; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) - protected String repositorySpecificInformation; + protected String cmisVersionsSupported; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0") + protected XML repositorySpecificInformation; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected CapabilitiesType capabilities; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected List relatedRepositories; /** * Gets the value of the repositoryId property. @@ -115,6 +129,30 @@ public class RepositoryInfoType { this.repositoryName = value; } + /** + * Gets the value of the repositoryURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryURI() { + return repositoryURI; + } + + /** + * Sets the value of the repositoryURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryURI(String value) { + this.repositoryURI = value; + } + /** * Gets the value of the repositoryDescription property. * @@ -236,14 +274,38 @@ public class RepositoryInfoType { } /** - * Gets the value of the repositorySpecificInformation property. + * Gets the value of the cmisVersionsSupported property. * * @return * possible object is * {@link String } * */ - public String getRepositorySpecificInformation() { + public String getCmisVersionsSupported() { + return cmisVersionsSupported; + } + + /** + * Sets the value of the cmisVersionsSupported property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCmisVersionsSupported(String value) { + this.cmisVersionsSupported = value; + } + + /** + * Gets the value of the repositorySpecificInformation property. + * + * @return + * possible object is + * {@link XML } + * + */ + public XML getRepositorySpecificInformation() { return repositorySpecificInformation; } @@ -252,10 +314,10 @@ public class RepositoryInfoType { * * @param value * allowed object is - * {@link String } + * {@link XML } * */ - public void setRepositorySpecificInformation(String value) { + public void setRepositorySpecificInformation(XML value) { this.repositorySpecificInformation = value; } @@ -283,4 +345,33 @@ public class RepositoryInfoType { this.capabilities = value; } + /** + * Gets the value of the relatedRepositories property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the relatedRepositories property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getRelatedRepositories().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link RelatedRepositoriesType } + * + * + */ + public List getRelatedRepositories() { + if (relatedRepositories == null) { + relatedRepositories = new ArrayList(); + } + return this.relatedRepositories; + } + } diff --git a/source/generated/org/alfresco/repo/cmis/ws/RepositoryService.java b/source/generated/org/alfresco/repo/cmis/ws/RepositoryService.java index 2c79af5047..42eb7d968d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/RepositoryService.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RepositoryService.java @@ -11,12 +11,12 @@ import org.alfresco.repo.cmis.ws.RepositoryServicePort; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:20 EEST 2008 + * Tue Jul 29 18:21:55 EEST 2008 * Generated source version: 2.0.6 * */ -@WebServiceClient(name = "RepositoryService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/RepositoryService.wsdl") +@WebServiceClient(name = "RepositoryService", targetNamespace = "http://www.cmis.org/ns/1.0", wsdlLocation = "file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RepositoryService.wsdl") public class RepositoryService extends Service { public final static URL WSDL_LOCATION; @@ -25,9 +25,9 @@ public class RepositoryService extends Service { static { URL url = null; try { - url = new URL("file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/RepositoryService.wsdl"); + url = new URL("file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RepositoryService.wsdl"); } catch (MalformedURLException e) { - System.err.println("Can not initialize the default wsdl from file:/D:/work/AlfrescoCMIS-WS/WScmis/web/wsdl/cmis/RepositoryService.wsdl"); + System.err.println("Can not initialize the default wsdl from file:/D:/work/CMIS-WS/CMIS-WS/web/wsdl/cmis/RepositoryService.wsdl"); // e.printStackTrace(); } WSDL_LOCATION = url; diff --git a/source/generated/org/alfresco/repo/cmis/ws/RepositoryServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/RepositoryServicePort.java index 94db8b7b8b..9a004fafe3 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/RepositoryServicePort.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RepositoryServicePort.java @@ -3,7 +3,6 @@ package org.alfresco.repo.cmis.ws; import javax.jws.WebMethod; import javax.jws.WebParam; -import javax.jws.WebParam.Mode; import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @@ -13,7 +12,7 @@ import javax.xml.ws.ResponseWrapper; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:20 EEST 2008 + * Tue Jul 29 18:21:55 EEST 2008 * Generated source version: 2.0.6 * */ @@ -22,39 +21,37 @@ import javax.xml.ws.ResponseWrapper; public interface RepositoryServicePort { - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - @WebResult(name = "getRootFolderResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") - @WebMethod - public org.alfresco.repo.cmis.ws.GetRootFolderResponse getRootFolder( - @WebParam(partName = "parameters", name = "getRootFolder", targetNamespace = "http://www.cmis.org/ns/1.0") - GetRootFolder parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException; - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) @WebResult(name = "getTypesResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters") @WebMethod public org.alfresco.repo.cmis.ws.GetTypesResponse getTypes( @WebParam(partName = "parameters", name = "getTypes", targetNamespace = "http://www.cmis.org/ns/1.0") GetTypes parameters - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, PermissionDeniedException; + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; @ResponseWrapper(localName = "getTypeDefinitionResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetTypeDefinitionResponse") @RequestWrapper(localName = "getTypeDefinition", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetTypeDefinition") + @WebResult(name = "type", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod - public void getTypeDefinition( + public org.alfresco.repo.cmis.ws.ObjectTypeDefinitionType getTypeDefinition( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId, @WebParam(name = "typeId", targetNamespace = "http://www.cmis.org/ns/1.0") - java.lang.String typeId, - @WebParam(name = "includeInheritedProperties", targetNamespace = "http://www.cmis.org/ns/1.0") - java.lang.Boolean includeInheritedProperties, - @WebParam(mode = WebParam.Mode.OUT, name = "type", targetNamespace = "http://www.cmis.org/ns/1.0") - javax.xml.ws.Holder type, - @WebParam(mode = WebParam.Mode.OUT, name = "canCreateInstances", targetNamespace = "http://www.cmis.org/ns/1.0") - javax.xml.ws.Holder canCreateInstances - ) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, OperationNotSupportedException, PermissionDeniedException; + java.lang.String typeId + ) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; + + @ResponseWrapper(localName = "getRepositoriesResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetRepositoriesResponse") + @RequestWrapper(localName = "getRepositories", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetRepositories") + @WebResult(name = "repository", targetNamespace = "http://www.cmis.org/ns/1.0") + @WebMethod + public java.util.List getRepositories() throws RuntimeException, InvalidArgumentException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; @ResponseWrapper(localName = "getRepositoryInfoResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetRepositoryInfoResponse") @RequestWrapper(localName = "getRepositoryInfo", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.GetRepositoryInfo") @WebResult(name = "repositoryInfo", targetNamespace = "http://www.cmis.org/ns/1.0") @WebMethod - public org.alfresco.repo.cmis.ws.RepositoryInfoType getRepositoryInfo() throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, PermissionDeniedException; + public org.alfresco.repo.cmis.ws.RepositoryInfoType getRepositoryInfo( + @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0") + java.lang.String repositoryId + ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/RepositoryType.java b/source/generated/org/alfresco/repo/cmis/ws/RepositoryType.java new file mode 100755 index 0000000000..4bca2d67f1 --- /dev/null +++ b/source/generated/org/alfresco/repo/cmis/ws/RepositoryType.java @@ -0,0 +1,118 @@ + +package org.alfresco.repo.cmis.ws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for repositoryType complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="repositoryType">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="repositoryID" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *         <element name="repositoryName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="repositoryURI" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "repositoryType", propOrder = { + "repositoryID", + "repositoryName", + "repositoryURI" +}) +public class RepositoryType { + + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryID; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryName; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryURI; + + /** + * Gets the value of the repositoryID property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryID() { + return repositoryID; + } + + /** + * Sets the value of the repositoryID property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryID(String value) { + this.repositoryID = value; + } + + /** + * Gets the value of the repositoryName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryName() { + return repositoryName; + } + + /** + * Sets the value of the repositoryName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryName(String value) { + this.repositoryName = value; + } + + /** + * Gets the value of the repositoryURI property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryURI() { + return repositoryURI; + } + + /** + * Sets the value of the repositoryURI property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryURI(String value) { + this.repositoryURI = value; + } + +} diff --git a/source/generated/org/alfresco/repo/cmis/ws/RuntimeException.java b/source/generated/org/alfresco/repo/cmis/ws/RuntimeException.java index 0f7fd6ea9e..f51cb288ac 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/RuntimeException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/RuntimeException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:27 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "RuntimeFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "runtimeException", targetNamespace = "http://www.cmis.org/ns/1.0") public class RuntimeException extends Exception { - public static final long serialVersionUID = 20080527141127L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault runtimeFault; + private org.alfresco.repo.cmis.ws.BasicFault runtimeException; public RuntimeException() { super(); @@ -30,17 +30,17 @@ public class RuntimeException extends Exception { super(message, cause); } - public RuntimeException(String message, org.alfresco.repo.cmis.ws.BasicFault runtimeFault) { + public RuntimeException(String message, org.alfresco.repo.cmis.ws.BasicFault runtimeException) { super(message); - this.runtimeFault = runtimeFault; + this.runtimeException = runtimeException; } - public RuntimeException(String message, org.alfresco.repo.cmis.ws.BasicFault runtimeFault, Throwable cause) { + public RuntimeException(String message, org.alfresco.repo.cmis.ws.BasicFault runtimeException, Throwable cause) { super(message, cause); - this.runtimeFault = runtimeFault; + this.runtimeException = runtimeException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.runtimeFault; + return this.runtimeException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/SetContentStream.java b/source/generated/org/alfresco/repo/cmis/ws/SetContentStream.java index 8db0ff529c..44fdf4be2e 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/SetContentStream.java +++ b/source/generated/org/alfresco/repo/cmis/ws/SetContentStream.java @@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="documentId" type="{http://www.cmis.org/ns/1.0}objectID"/> + * <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/> + * <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/> * <element name="overwriteFlag" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> - * <element ref="{http://www.cmis.org/ns/1.0}contentStream" minOccurs="0"/> + * <element ref="{http://www.cmis.org/ns/1.0}contentStream"/> * </sequence> * </restriction> * </complexContent> @@ -33,6 +34,7 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { + "repositoryId", "documentId", "overwriteFlag", "contentStream" @@ -40,12 +42,38 @@ import javax.xml.bind.annotation.XmlType; @XmlRootElement(name = "setContentStream") public class SetContentStream { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String repositoryId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) protected String documentId; @XmlElement(namespace = "http://www.cmis.org/ns/1.0") protected Boolean overwriteFlag; - @XmlElement(namespace = "http://www.cmis.org/ns/1.0") - protected ContentStream contentStream; + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected ContentStreamType contentStream; + + /** + * Gets the value of the repositoryId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRepositoryId() { + return repositoryId; + } + + /** + * Sets the value of the repositoryId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRepositoryId(String value) { + this.repositoryId = value; + } /** * Gets the value of the documentId property. @@ -100,10 +128,10 @@ public class SetContentStream { * * @return * possible object is - * {@link ContentStream } + * {@link ContentStreamType } * */ - public ContentStream getContentStream() { + public ContentStreamType getContentStream() { return contentStream; } @@ -112,10 +140,10 @@ public class SetContentStream { * * @param value * allowed object is - * {@link ContentStream } + * {@link ContentStreamType } * */ - public void setContentStream(ContentStream value) { + public void setContentStream(ContentStreamType value) { this.contentStream = value; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/SetContentStreamResponse.java b/source/generated/org/alfresco/repo/cmis/ws/SetContentStreamResponse.java index c61012bb62..f23051a43e 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/SetContentStreamResponse.java +++ b/source/generated/org/alfresco/repo/cmis/ws/SetContentStreamResponse.java @@ -3,6 +3,7 @@ package org.alfresco.repo.cmis.ws; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -18,6 +19,7 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> + * <element name="documentId" type="{http://www.cmis.org/ns/1.0}ID"/> * </sequence> * </restriction> * </complexContent> @@ -28,9 +30,37 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") +@XmlType(name = "", propOrder = { + "documentId" +}) @XmlRootElement(name = "setContentStreamResponse") public class SetContentStreamResponse { + @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true) + protected String documentId; + + /** + * Gets the value of the documentId property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDocumentId() { + return documentId; + } + + /** + * Sets the value of the documentId property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDocumentId(String value) { + this.documentId = value; + } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/StorageException.java b/source/generated/org/alfresco/repo/cmis/ws/StorageException.java index d225a8d7fc..3601220d2d 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/StorageException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/StorageException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 + * Tue Jul 29 18:21:47 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "StorageFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "storageException", targetNamespace = "http://www.cmis.org/ns/1.0") public class StorageException extends Exception { - public static final long serialVersionUID = 20080527141113L; + public static final long serialVersionUID = 20080729182147L; - private org.alfresco.repo.cmis.ws.BasicFault storageFault; + private org.alfresco.repo.cmis.ws.BasicFault storageException; public StorageException() { super(); @@ -30,17 +30,17 @@ public class StorageException extends Exception { super(message, cause); } - public StorageException(String message, org.alfresco.repo.cmis.ws.BasicFault storageFault) { + public StorageException(String message, org.alfresco.repo.cmis.ws.BasicFault storageException) { super(message); - this.storageFault = storageFault; + this.storageException = storageException; } - public StorageException(String message, org.alfresco.repo.cmis.ws.BasicFault storageFault, Throwable cause) { + public StorageException(String message, org.alfresco.repo.cmis.ws.BasicFault storageException, Throwable cause) { super(message, cause); - this.storageFault = storageFault; + this.storageException = storageException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.storageFault; + return this.storageException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/StreamNotSupportedException.java b/source/generated/org/alfresco/repo/cmis/ws/StreamNotSupportedException.java index 67e0343b00..d4b879937b 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/StreamNotSupportedException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/StreamNotSupportedException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:13 EEST 2008 + * Tue Jul 29 18:21:47 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "StreamNotSupportedFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "streamNotSupportedException", targetNamespace = "http://www.cmis.org/ns/1.0") public class StreamNotSupportedException extends Exception { - public static final long serialVersionUID = 20080527141113L; + public static final long serialVersionUID = 20080729182147L; - private org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedFault; + private org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedException; public StreamNotSupportedException() { super(); @@ -30,17 +30,17 @@ public class StreamNotSupportedException extends Exception { super(message, cause); } - public StreamNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedFault) { + public StreamNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedException) { super(message); - this.streamNotSupportedFault = streamNotSupportedFault; + this.streamNotSupportedException = streamNotSupportedException; } - public StreamNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedFault, Throwable cause) { + public StreamNotSupportedException(String message, org.alfresco.repo.cmis.ws.BasicFault streamNotSupportedException, Throwable cause) { super(message, cause); - this.streamNotSupportedFault = streamNotSupportedFault; + this.streamNotSupportedException = streamNotSupportedException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.streamNotSupportedFault; + return this.streamNotSupportedException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/TypeNotFoundException.java b/source/generated/org/alfresco/repo/cmis/ws/TypeNotFoundException.java index 3573cdc3a3..a640bddd54 100644 --- a/source/generated/org/alfresco/repo/cmis/ws/TypeNotFoundException.java +++ b/source/generated/org/alfresco/repo/cmis/ws/TypeNotFoundException.java @@ -6,17 +6,17 @@ import javax.xml.ws.WebFault; /** * This class was generated by Apache CXF 2.0.6 - * Tue May 27 14:11:20 EEST 2008 + * Tue Jul 29 18:22:39 EEST 2008 * Generated source version: 2.0.6 * */ -@WebFault(name = "TypeNotFoundFault", targetNamespace = "http://www.cmis.org/ns/1.0") +@WebFault(name = "typeNotFoundException", targetNamespace = "http://www.cmis.org/ns/1.0") public class TypeNotFoundException extends Exception { - public static final long serialVersionUID = 20080527141120L; + public static final long serialVersionUID = 20080729182239L; - private org.alfresco.repo.cmis.ws.BasicFault typeNotFoundFault; + private org.alfresco.repo.cmis.ws.BasicFault typeNotFoundException; public TypeNotFoundException() { super(); @@ -30,17 +30,17 @@ public class TypeNotFoundException extends Exception { super(message, cause); } - public TypeNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault typeNotFoundFault) { + public TypeNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault typeNotFoundException) { super(message); - this.typeNotFoundFault = typeNotFoundFault; + this.typeNotFoundException = typeNotFoundException; } - public TypeNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault typeNotFoundFault, Throwable cause) { + public TypeNotFoundException(String message, org.alfresco.repo.cmis.ws.BasicFault typeNotFoundException, Throwable cause) { super(message, cause); - this.typeNotFoundFault = typeNotFoundFault; + this.typeNotFoundException = typeNotFoundException; } public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() { - return this.typeNotFoundFault; + return this.typeNotFoundException; } } diff --git a/source/generated/org/alfresco/repo/cmis/ws/TypesOfObjectsEnum.java b/source/generated/org/alfresco/repo/cmis/ws/TypesOfFileableObjectsEnum.java old mode 100644 new mode 100755 similarity index 60% rename from source/generated/org/alfresco/repo/cmis/ws/TypesOfObjectsEnum.java rename to source/generated/org/alfresco/repo/cmis/ws/TypesOfFileableObjectsEnum.java index a7a7ec447a..ca469081af --- a/source/generated/org/alfresco/repo/cmis/ws/TypesOfObjectsEnum.java +++ b/source/generated/org/alfresco/repo/cmis/ws/TypesOfFileableObjectsEnum.java @@ -6,33 +6,36 @@ import javax.xml.bind.annotation.XmlEnumValue; /** - *

Java class for typesOfObjectsEnum. + *

Java class for typesOfFileableObjectsEnum. * *

The following schema fragment specifies the expected content contained within this class. *

*

- * <simpleType name="typesOfObjectsEnum">
+ * <simpleType name="typesOfFileableObjectsEnum">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     <enumeration value="Folders"/>
- *     <enumeration value="FoldersAndDocumets"/>
  *     <enumeration value="Documents"/>
+ *     <enumeration value="Folders"/>
+ *     <enumeration value="Policies"/>
+ *     <enumeration value="Any"/>
  *   </restriction>
  * </simpleType>
  * 
* */ @XmlEnum -public enum TypesOfObjectsEnum { +public enum TypesOfFileableObjectsEnum { + @XmlEnumValue("Any") + ANY("Any"), @XmlEnumValue("Documents") DOCUMENTS("Documents"), @XmlEnumValue("Folders") FOLDERS("Folders"), - @XmlEnumValue("FoldersAndDocumets") - FOLDERS_AND_DOCUMETS("FoldersAndDocumets"); + @XmlEnumValue("Policies") + POLICIES("Policies"); private final String value; - TypesOfObjectsEnum(String v) { + TypesOfFileableObjectsEnum(String v) { value = v; } @@ -40,8 +43,8 @@ public enum TypesOfObjectsEnum { return value; } - public static TypesOfObjectsEnum fromValue(String v) { - for (TypesOfObjectsEnum c: TypesOfObjectsEnum.values()) { + public static TypesOfFileableObjectsEnum fromValue(String v) { + for (TypesOfFileableObjectsEnum c: TypesOfFileableObjectsEnum.values()) { if (c.value.equals(v)) { return c; } diff --git a/source/generated/org/alfresco/repo/cmis/ws/DeleteWithMultiFilingEnum.java b/source/generated/org/alfresco/repo/cmis/ws/UnfileNonfolderObjectsEnum.java old mode 100644 new mode 100755 similarity index 61% rename from source/generated/org/alfresco/repo/cmis/ws/DeleteWithMultiFilingEnum.java rename to source/generated/org/alfresco/repo/cmis/ws/UnfileNonfolderObjectsEnum.java index 4f34845ce9..a60157d910 --- a/source/generated/org/alfresco/repo/cmis/ws/DeleteWithMultiFilingEnum.java +++ b/source/generated/org/alfresco/repo/cmis/ws/UnfileNonfolderObjectsEnum.java @@ -6,15 +6,15 @@ import javax.xml.bind.annotation.XmlEnumValue; /** - *

Java class for deleteWithMultiFilingEnum. + *

Java class for unfileNonfolderObjectsEnum. * *

The following schema fragment specifies the expected content contained within this class. *

*

- * <simpleType name="deleteWithMultiFilingEnum">
+ * <simpleType name="unfileNonfolderObjectsEnum">
  *   <restriction base="{http://www.w3.org/2001/XMLSchema}string">
  *     <enumeration value="unfile"/>
- *     <enumeration value="deleteSingleFiledDocs"/>
+ *     <enumeration value="deleteSingleFiled"/>
  *     <enumeration value="delete"/>
  *   </restriction>
  * </simpleType>
@@ -22,17 +22,17 @@ import javax.xml.bind.annotation.XmlEnumValue;
  * 
  */
 @XmlEnum
-public enum DeleteWithMultiFilingEnum {
+public enum UnfileNonfolderObjectsEnum {
 
     @XmlEnumValue("delete")
     DELETE("delete"),
-    @XmlEnumValue("deleteSingleFiledDocs")
-    DELETE_SINGLE_FILED_DOCS("deleteSingleFiledDocs"),
+    @XmlEnumValue("deleteSingleFiled")
+    DELETE_SINGLE_FILED("deleteSingleFiled"),
     @XmlEnumValue("unfile")
     UNFILE("unfile");
     private final String value;
 
-    DeleteWithMultiFilingEnum(String v) {
+    UnfileNonfolderObjectsEnum(String v) {
         value = v;
     }
 
@@ -40,8 +40,8 @@ public enum DeleteWithMultiFilingEnum {
         return value;
     }
 
-    public static DeleteWithMultiFilingEnum fromValue(String v) {
-        for (DeleteWithMultiFilingEnum c: DeleteWithMultiFilingEnum.values()) {
+    public static UnfileNonfolderObjectsEnum fromValue(String v) {
+        for (UnfileNonfolderObjectsEnum c: UnfileNonfolderObjectsEnum.values()) {
             if (c.value.equals(v)) {
                 return c;
             }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/UpdateConflictException.java b/source/generated/org/alfresco/repo/cmis/ws/UpdateConflictException.java
new file mode 100755
index 0000000000..9afbc3d0af
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/UpdateConflictException.java
@@ -0,0 +1,46 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by Apache CXF 2.0.6
+ * Tue Jul 29 18:22:39 EEST 2008
+ * Generated source version: 2.0.6
+ * 
+ */
+
+@WebFault(name = "updateConflictException", targetNamespace = "http://www.cmis.org/ns/1.0")
+
+public class UpdateConflictException extends Exception {
+    public static final long serialVersionUID = 20080729182239L;
+    
+    private org.alfresco.repo.cmis.ws.BasicFault updateConflictException;
+
+    public UpdateConflictException() {
+        super();
+    }
+    
+    public UpdateConflictException(String message) {
+        super(message);
+    }
+    
+    public UpdateConflictException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UpdateConflictException(String message, org.alfresco.repo.cmis.ws.BasicFault updateConflictException) {
+        super(message);
+        this.updateConflictException = updateConflictException;
+    }
+
+    public UpdateConflictException(String message, org.alfresco.repo.cmis.ws.BasicFault updateConflictException, Throwable cause) {
+        super(message, cause);
+        this.updateConflictException = updateConflictException;
+    }
+
+    public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() {
+        return this.updateConflictException;
+    }
+}
diff --git a/source/generated/org/alfresco/repo/cmis/ws/UpdateProperties.java b/source/generated/org/alfresco/repo/cmis/ws/UpdateProperties.java
index a7261ad903..54367e6790 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/UpdateProperties.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/UpdateProperties.java
@@ -19,9 +19,10 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
- *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}objectID"/>
+ *           <element name="repositoryId" type="{http://www.cmis.org/ns/1.0}ID"/>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *           <element name="changeToken" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *           <element name="object" type="{http://www.cmis.org/ns/1.0}documentFolderOrRelationshipObjectType"/>
+ *           <element name="properties" type="{http://www.cmis.org/ns/1.0}propertiesType"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -33,19 +34,46 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
+    "repositoryId",
     "objectId",
     "changeToken",
-    "object"
+    "properties"
 })
 @XmlRootElement(name = "updateProperties")
 public class UpdateProperties {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String repositoryId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
     protected String objectId;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0")
     protected String changeToken;
     @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
-    protected DocumentFolderOrRelationshipObjectType object;
+    protected PropertiesType properties;
+
+    /**
+     * Gets the value of the repositoryId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getRepositoryId() {
+        return repositoryId;
+    }
+
+    /**
+     * Sets the value of the repositoryId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepositoryId(String value) {
+        this.repositoryId = value;
+    }
 
     /**
      * Gets the value of the objectId property.
@@ -96,27 +124,27 @@ public class UpdateProperties {
     }
 
     /**
-     * Gets the value of the object property.
+     * Gets the value of the properties property.
      * 
      * @return
      *     possible object is
-     *     {@link DocumentFolderOrRelationshipObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public DocumentFolderOrRelationshipObjectType getObject() {
-        return object;
+    public PropertiesType getProperties() {
+        return properties;
     }
 
     /**
-     * Sets the value of the object property.
+     * Sets the value of the properties property.
      * 
      * @param value
      *     allowed object is
-     *     {@link DocumentFolderOrRelationshipObjectType }
+     *     {@link PropertiesType }
      *     
      */
-    public void setObject(DocumentFolderOrRelationshipObjectType value) {
-        this.object = value;
+    public void setProperties(PropertiesType value) {
+        this.properties = value;
     }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/UpdatePropertiesResponse.java b/source/generated/org/alfresco/repo/cmis/ws/UpdatePropertiesResponse.java
index ce047adc80..e309fc6ee6 100644
--- a/source/generated/org/alfresco/repo/cmis/ws/UpdatePropertiesResponse.java
+++ b/source/generated/org/alfresco/repo/cmis/ws/UpdatePropertiesResponse.java
@@ -3,6 +3,7 @@ package org.alfresco.repo.cmis.ws;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
@@ -18,6 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <complexContent>
  *       <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *         <sequence>
+ *           <element name="objectId" type="{http://www.cmis.org/ns/1.0}ID"/>
  *         </sequence>
  *       </restriction>
  *     </complexContent>
@@ -28,9 +30,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "")
+@XmlType(name = "", propOrder = {
+    "objectId"
+})
 @XmlRootElement(name = "updatePropertiesResponse")
 public class UpdatePropertiesResponse {
 
+    @XmlElement(namespace = "http://www.cmis.org/ns/1.0", required = true)
+    protected String objectId;
+
+    /**
+     * Gets the value of the objectId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getObjectId() {
+        return objectId;
+    }
+
+    /**
+     * Sets the value of the objectId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setObjectId(String value) {
+        this.objectId = value;
+    }
 
 }
diff --git a/source/generated/org/alfresco/repo/cmis/ws/VersioningException.java b/source/generated/org/alfresco/repo/cmis/ws/VersioningException.java
new file mode 100755
index 0000000000..d500a0fc6f
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/VersioningException.java
@@ -0,0 +1,46 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.xml.ws.WebFault;
+
+
+/**
+ * This class was generated by Apache CXF 2.0.6
+ * Tue Jul 29 18:21:47 EEST 2008
+ * Generated source version: 2.0.6
+ * 
+ */
+
+@WebFault(name = "versioningException", targetNamespace = "http://www.cmis.org/ns/1.0")
+
+public class VersioningException extends Exception {
+    public static final long serialVersionUID = 20080729182147L;
+    
+    private org.alfresco.repo.cmis.ws.BasicFault versioningException;
+
+    public VersioningException() {
+        super();
+    }
+    
+    public VersioningException(String message) {
+        super(message);
+    }
+    
+    public VersioningException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public VersioningException(String message, org.alfresco.repo.cmis.ws.BasicFault versioningException) {
+        super(message);
+        this.versioningException = versioningException;
+    }
+
+    public VersioningException(String message, org.alfresco.repo.cmis.ws.BasicFault versioningException, Throwable cause) {
+        super(message, cause);
+        this.versioningException = versioningException;
+    }
+
+    public org.alfresco.repo.cmis.ws.BasicFault getFaultInfo() {
+        return this.versioningException;
+    }
+}
diff --git a/source/generated/org/alfresco/repo/cmis/ws/VersioningServicePort.java b/source/generated/org/alfresco/repo/cmis/ws/VersioningServicePort.java
new file mode 100755
index 0000000000..f090abb898
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/VersioningServicePort.java
@@ -0,0 +1,80 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebParam.Mode;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.0.6
+ * Wed Jul 23 17:17:31 EEST 2008
+ * Generated source version: 2.0.6
+ * 
+ */
+
+@WebService(targetNamespace = "http://www.cmis.org/ns/1.0", name = "VersioningServicePort")
+
+public interface VersioningServicePort {
+
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    @WebResult(name = "checkInResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters")
+    @WebMethod
+    public org.alfresco.repo.cmis.ws.CheckInResponse checkIn(
+        @WebParam(partName = "parameters", name = "checkIn", targetNamespace = "http://www.cmis.org/ns/1.0")
+        CheckIn parameters
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, PermissionDeniedException;
+
+    @ResponseWrapper(localName = "cancelCheckOutResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CancelCheckOutResponse")
+    @RequestWrapper(localName = "cancelCheckOut", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CancelCheckOut")
+    @WebMethod
+    public void cancelCheckOut(
+        @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        java.lang.String repositoryId,
+        @WebParam(name = "documentId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        java.lang.String documentId
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    @WebResult(name = "getAllVersionsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters")
+    @WebMethod
+    public org.alfresco.repo.cmis.ws.GetAllVersionsResponse getAllVersions(
+        @WebParam(partName = "parameters", name = "getAllVersions", targetNamespace = "http://www.cmis.org/ns/1.0")
+        GetAllVersions parameters
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+
+    @ResponseWrapper(localName = "deleteAllVersionsResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteAllVersionsResponse")
+    @RequestWrapper(localName = "deleteAllVersions", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.DeleteAllVersions")
+    @WebMethod
+    public void deleteAllVersions(
+        @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        java.lang.String repositoryId,
+        @WebParam(name = "versionSeriesId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        java.lang.String versionSeriesId
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+
+    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+    @WebResult(name = "getPropertiesOfLatestVersionResponse", targetNamespace = "http://www.cmis.org/ns/1.0", partName = "parameters")
+    @WebMethod
+    public org.alfresco.repo.cmis.ws.GetPropertiesOfLatestVersionResponse getPropertiesOfLatestVersion(
+        @WebParam(partName = "parameters", name = "getPropertiesOfLatestVersion", targetNamespace = "http://www.cmis.org/ns/1.0")
+        GetPropertiesOfLatestVersion parameters
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+
+    @ResponseWrapper(localName = "checkOutResponse", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CheckOutResponse")
+    @RequestWrapper(localName = "checkOut", targetNamespace = "http://www.cmis.org/ns/1.0", className = "org.alfresco.repo.cmis.ws.CheckOut")
+    @WebMethod
+    public void checkOut(
+        @WebParam(name = "repositoryId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        java.lang.String repositoryId,
+        @WebParam(mode = WebParam.Mode.INOUT, name = "documentId", targetNamespace = "http://www.cmis.org/ns/1.0")
+        javax.xml.ws.Holder documentId,
+        @WebParam(mode = WebParam.Mode.OUT, name = "contentCopied", targetNamespace = "http://www.cmis.org/ns/1.0")
+        javax.xml.ws.Holder contentCopied
+    ) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException;
+}
diff --git a/source/generated/org/alfresco/repo/cmis/ws/XML.java b/source/generated/org/alfresco/repo/cmis/ws/XML.java
new file mode 100755
index 0000000000..f65b04c965
--- /dev/null
+++ b/source/generated/org/alfresco/repo/cmis/ws/XML.java
@@ -0,0 +1,70 @@
+
+package org.alfresco.repo.cmis.ws;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * 

Java class for XML complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + *

+ * <complexType name="XML">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <any/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ * 
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "XML", propOrder = { + "any" +}) +public class XML { + + @XmlAnyElement + protected List any; + + /** + * Gets the value of the any property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the any property. + * + *

+ * For example, to add a new item, do as follows: + *

+     *    getAny().add(newItem);
+     * 
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link Element } + * + * + */ + public List getAny() { + if (any == null) { + any = new ArrayList(); + } + return this.any; + } + +} diff --git a/source/java/org/alfresco/repo/cmis/rest/BaseCMISWebScriptTest.java b/source/java/org/alfresco/repo/cmis/rest/BaseCMISWebScriptTest.java index 86fa3e9b1f..66093c7bc7 100644 --- a/source/java/org/alfresco/repo/cmis/rest/BaseCMISWebScriptTest.java +++ b/source/java/org/alfresco/repo/cmis/rest/BaseCMISWebScriptTest.java @@ -152,7 +152,7 @@ public class BaseCMISWebScriptTest extends BaseWebScriptTest throw new IOException(classPath + " not found."); } - InputStreamReader reader = new InputStreamReader(input); + InputStreamReader reader = new InputStreamReader(input, "UTF-8"); StringWriter writer = new StringWriter(); try diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java b/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java new file mode 100644 index 0000000000..014bb30f7a --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/CMISResultSetMethod.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2005-2007 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.rest; + +import java.util.List; + +import org.alfresco.cmis.search.CMISResultSet; +import org.alfresco.repo.web.scripts.RepositoryImageResolver; +import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.repository.TemplateImageResolver; + +import freemarker.ext.beans.BeanModel; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; + +/** + * Custom FreeMarker Template language method. + *

+ * Creates a CMIS result set that builds TemplateNode on iteration + *

+ * Usage: cmisresultset(CMISResultSet resultset) + * + * @author davidc + */ +public final class CMISResultSetMethod implements TemplateMethodModelEx +{ + private ServiceRegistry serviceRegistry; + private TemplateImageResolver imageResolver; + + /** + * Construct + */ + public CMISResultSetMethod(ServiceRegistry serviceRegistry, RepositoryImageResolver imageResolver) + { + this.serviceRegistry = serviceRegistry; + this.imageResolver = imageResolver.getImageResolver(); + } + + /** + * @see freemarker.template.TemplateMethodModel#exec(java.util.List) + */ + @SuppressWarnings("unchecked") + public Object exec(List args) throws TemplateModelException + { + CMISTemplateResultSet resultSet = null; + + if (args.size() == 1) + { + Object arg0 = args.get(0); + if (arg0 instanceof BeanModel) + { + // extract cmis result set + Object wrapped = ((BeanModel)arg0).getWrappedObject(); + if (wrapped != null) + { + if (wrapped instanceof CMISResultSet) + { + resultSet = new CMISTemplateResultSet((CMISResultSet)wrapped, serviceRegistry, imageResolver); + } + } + } + } + + return resultSet; + } +} diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java index c7a65e78c8..252ac23763 100644 --- a/source/java/org/alfresco/repo/cmis/rest/CMISScript.java +++ b/source/java/org/alfresco/repo/cmis/rest/CMISScript.java @@ -32,7 +32,9 @@ import org.alfresco.cmis.CMISService.TypesFilter; import org.alfresco.cmis.dictionary.CMISDictionaryService; import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.dictionary.CMISTypeId; +import org.alfresco.cmis.search.CMISQueryOptions; import org.alfresco.cmis.search.CMISQueryService; +import org.alfresco.cmis.search.CMISResultSet; import org.alfresco.cmis.search.FullTextSearchSupport; import org.alfresco.cmis.search.JoinSupport; import org.alfresco.error.AlfrescoRuntimeException; @@ -215,6 +217,27 @@ public class CMISScript extends BaseScopableProcessorExtension } } + /** + * Resolve to a Types Filter + * + * NOTE: If specified types filter is not specified or invalid, the default types + * filter is returned + * + * @param typesFilter types filter + * @return resolved types filter + */ + private TypesFilter resolveTypesFilter(String typesFilter) + { + if (isValidTypesFilter(typesFilter)) + { + return TypesFilter.valueOf(typesFilter); + } + else + { + return defaultTypesFilter; + } + } + /** * Finds a Node with the repository given a reference * @@ -419,23 +442,21 @@ public class CMISScript extends BaseScopableProcessorExtension } /** - * Resolve to a Types Filter + * Issue query * - * NOTE: If specified types filter is not specified or invalid, the default types - * filter is returned - * - * @param typesFilter types filter - * @return resolved types filter + * @param statement query statement + * @param page + * + * @return paged result set */ - private TypesFilter resolveTypesFilter(String typesFilter) + public PagedResults query(String statement, Page page) { - if (isValidTypesFilter(typesFilter)) - { - return TypesFilter.valueOf(typesFilter); - } - else - { - return defaultTypesFilter; - } + CMISQueryOptions options = new CMISQueryOptions(statement, cmisService.getDefaultRootStoreRef()); + options.setSkipCount(page.getNumber()); + options.setMaxItems(page.getSize()); + CMISResultSet resultSet = cmisQueryService.query(options); + Cursor cursor = paging.createCursor(resultSet.getLength() + (resultSet.hasMore() ? 1 : 0) , page); + return paging.createPagedResult(resultSet, cursor); } + } diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java new file mode 100644 index 0000000000..dc2cc28600 --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/rest/CMISTemplateResultSet.java @@ -0,0 +1,275 @@ +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.rest; + +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.alfresco.cmis.search.CMISResultSet; +import org.alfresco.cmis.search.CMISResultSetColumn; +import org.alfresco.cmis.search.CMISResultSetMetaData; +import org.alfresco.cmis.search.CMISResultSetRow; +import org.alfresco.repo.template.TemplateNode; +import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.TemplateImageResolver; + +import freemarker.core.Environment; +import freemarker.template.SimpleCollection; +import freemarker.template.TemplateCollectionModel; +import freemarker.template.TemplateModelException; + + +/** + * CMIS Result Set for use in Freemarker + * + * @author davidc + */ +public class CMISTemplateResultSet implements Serializable +{ + private static final long serialVersionUID = 2245418238171563934L; + + private CMISResultSet resultSet; + private ServiceRegistry serviceRegistry; + private TemplateImageResolver imageResolver; + + /** + * Construct + * + * @param resultSet + * @param serviceRegistry + * @param imageResolver + */ + public CMISTemplateResultSet(CMISResultSet resultSet, ServiceRegistry serviceRegistry, TemplateImageResolver imageResolver) + { + this.resultSet = resultSet; + this.serviceRegistry = serviceRegistry; + this.imageResolver = imageResolver; + } + + /** + * @return result set meta-data + */ + public CMISResultSetMetaData getMetaData() + { + return resultSet.getMetaData(); + } + + /** + * @return result set length + */ + public int getLength() + { + return resultSet.getLength(); + } + + /** + * @return start index within full result set + */ + public int getStart() + { + return resultSet.getStart(); + } + + /** + * @return selectors + */ + public String[] getSelectors() + { + return resultSet.getMetaData().getSelectorNames(); + } + + /** + * @return result set rows + * @throws TemplateModelException + */ + public TemplateCollectionModel getRows() + throws TemplateModelException + { + return new SimpleCollection(new TemplateIterator(resultSet.iterator()), Environment.getCurrentEnvironment().getObjectWrapper()); + } + + + /** + * Result Set Iterator + * + * @author davidc + */ + public class TemplateIterator implements Iterator + { + private Iterator iter; + + /** + * Construct + * + * @param iter + */ + public TemplateIterator(Iterator iter) + { + this.iter = iter; + } + + /* (non-Javadoc) + * @see java.util.Iterator#hasNext() + */ + public boolean hasNext() + { + return iter.hasNext(); + } + + /* (non-Javadoc) + * @see java.util.Iterator#next() + */ + public TemplateRow next() + { + return new TemplateRow(iter.next()); + } + + /* (non-Javadoc) + * @see java.util.Iterator#remove() + */ + public void remove() + { + iter.remove(); + } + + + /** + * Template Row + */ + public class TemplateRow + { + private CMISResultSetRow row; + private Map nodes = null; + + /** + * Construct + * + * @param row + */ + public TemplateRow(CMISResultSetRow row) + { + this.row = row; + } + + /** + * @return a map of serializable column values with the column name as the key + */ + public Map getValues() + { + return row.getValues(); + } + + /** + * @return nodes associated with row + */ + public Collection getNodes() + { + Map nodes = buildNodes(); + return nodes.size() == 0 ? null : nodes.values(); + } + + /** + * Builds a map of Template Nodes for the nodes associated with this row + * + * @return templates nodes indexed by selector + */ + private Map buildNodes() + { + if (nodes == null) + { + Map nodeRefs = row.getNodeRefs(); + if (nodeRefs == null || nodeRefs.size() == 0) + { + nodes = Collections.emptyMap(); + } + else + { + HashMap templateNodes = new HashMap(); + for (Map.Entry entry : nodeRefs.entrySet()) + { + templateNodes.put(entry.getKey(), new TemplateNode(entry.getValue(), serviceRegistry, imageResolver)); + } + nodes = templateNodes; + } + } + return nodes; + } + + /** + * Gets column type for specified column name + * + * @param colName column name + * @return column type + */ + public String getColumnType(String colName) + { + CMISResultSetColumn col = resultSet.getMetaData().getColumn(colName); + return col == null ? null : col.getPropertyType().name(); + } + + /** + * Gets node for specified selector + * + * @param selector + * @return template node + */ + public TemplateNode getSelectorNode(String selector) + { + return nodes.get(selector); + } + + /** + * @return overall score + */ + public float getScore() + { + return row.getScore(); + } + + /** + * @return a map of selector name to score + */ + public Float getSelectorScore(String selector) + { + return row.getScore(selector); + } + + /** + * NOTE: If you want the overall position in paged results you have to add the skipCount for the result set + * + * @return row index + */ + public int getIndex() + { + return row.getIndex(); + } + } + } +} diff --git a/source/java/org/alfresco/repo/cmis/rest/CMISTest.java b/source/java/org/alfresco/repo/cmis/rest/CMISTest.java index 6071c5cfa4..11fb7d6b73 100644 --- a/source/java/org/alfresco/repo/cmis/rest/CMISTest.java +++ b/source/java/org/alfresco/repo/cmis/rest/CMISTest.java @@ -40,15 +40,20 @@ import org.alfresco.web.scripts.TestWebScriptServer.Request; import org.alfresco.web.scripts.TestWebScriptServer.Response; import org.alfresco.web.scripts.atom.AbderaService; import org.alfresco.web.scripts.atom.AbderaServiceImpl; +import org.apache.abdera.ext.cmis.CMISCapabilities; import org.apache.abdera.ext.cmis.CMISConstants; import org.apache.abdera.ext.cmis.CMISExtensionFactory; import org.apache.abdera.ext.cmis.CMISProperties; +import org.apache.abdera.ext.cmis.CMISRepositoryInfo; import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.model.Collection; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.abdera.model.Link; import org.apache.abdera.model.Service; +import org.apache.abdera.model.Workspace; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** @@ -58,6 +63,9 @@ import org.apache.abdera.model.Service; */ public class CMISTest extends BaseCMISWebScriptTest { + // Logger + private static final Log logger = LogFactory.getLog(CMISTest.class); + private AbderaService abdera; // test context @@ -65,6 +73,7 @@ public class CMISTest extends BaseCMISWebScriptTest // cached responses private static Service service = null; + private static String fulltextCapability = null; private static Entry testsFolder = null; private static Entry testRunFolder = null; @@ -80,9 +89,6 @@ public class CMISTest extends BaseCMISWebScriptTest } - // TODO: checkout/checkin tests need to perform version property assertions - - @Override protected void setUp() throws Exception @@ -97,6 +103,9 @@ public class CMISTest extends BaseCMISWebScriptTest setDefaultRunAs("admin"); super.setUp(); + + if (logger.isInfoEnabled()) + logger.info("*** Test: " + getName() + " (HEADERS: " + getArgsAsHeaders() + ")"); } private Service getRepository() @@ -108,10 +117,16 @@ public class CMISTest extends BaseCMISWebScriptTest String xml = res.getContentAsString(); assertNotNull(xml); assertTrue(xml.length() > 0); - //assertValidXML(xml, getCMISValidator().getAppValidator()); service = abdera.parseService(new StringReader(xml), null); assertNotNull(service); + Workspace workspace = service.getWorkspaces().get(0); + CMISRepositoryInfo repoInfo = workspace.getExtension(CMISConstants.REPOSITORY_INFO); + assertNotNull(repoInfo); + CMISCapabilities capabilities = repoInfo.getCapabilities(); + assertNotNull(repoInfo); + fulltextCapability = capabilities.getFullText(); + assertNotNull(fulltextCapability); } return service; } @@ -143,6 +158,15 @@ public class CMISTest extends BaseCMISWebScriptTest return rootHREF; } + private IRI getQueryCollection(Service service) + { + Collection root = service.getCollection("Main Repository", "query collection"); + assertNotNull(root); + IRI rootHREF = root.getHref(); + assertNotNull(rootHREF); + return rootHREF; + } + private Entry createFolder(IRI parent, String name) throws Exception { @@ -178,7 +202,6 @@ public class CMISTest extends BaseCMISWebScriptTest throws Exception { String createFile = loadString(atomEntryFile); - name = name + " " + System.currentTimeMillis(); createFile = createFile.replace("${NAME}", name); Response res = sendRequest(new PostRequest(parent.toString(), createFile, Format.ATOMENTRY.mimetype()), 201, getAtomValidator()); assertNotNull(res); @@ -770,6 +793,7 @@ public class CMISTest extends BaseCMISWebScriptTest String checkinUrl = pwc.getSelfLink().getHref().toString(); Map args2 = new HashMap(); args2.put("checkinComment", guid); + args2.put("checkin", "true"); Response checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator()); assertNotNull(checkinRes); String checkinResXML = checkinRes.getContentAsString(); @@ -839,6 +863,7 @@ public class CMISTest extends BaseCMISWebScriptTest String checkinUrl = pwc.getSelfLink().getHref().toString(); Map args2 = new HashMap(); args2.put("checkinComment", guid); + args2.put("checkin", "true"); Response checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator()); assertNotNull(checkinRes); String checkinResXML = checkinRes.getContentAsString(); @@ -892,7 +917,8 @@ public class CMISTest extends BaseCMISWebScriptTest checkinFile = checkinFile.replace("${NAME}", "checkin " + i); String checkinUrl = pwc.getSelfLink().getHref().toString(); Map args2 = new HashMap(); - args2.put("checkinComment", "checkin " + i); + args2.put("checkinComment", "checkin" + i); + args2.put("checkin", "true"); Response checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200, getAtomValidator()); assertNotNull(checkinRes); } @@ -913,7 +939,9 @@ public class CMISTest extends BaseCMISWebScriptTest //assertEquals("Update Title checkin " + i, version.getTitle()); Response versionContentRes = sendRequest(new GetRequest(version.getContentSrc().toString()), 200); assertEquals("updated content checkin " + (NUMBER_OF_VERSIONS -1 - i), versionContentRes.getContentAsString()); - // TODO: test version specific properties e.g. checkin comment + CMISProperties versionProps = version.getExtension(CMISConstants.PROPERTIES); + assertNotNull(versionProps); + assertEquals("checkin" + + (NUMBER_OF_VERSIONS -1 - i), versionProps.getCheckinComment()); } } @@ -995,6 +1023,99 @@ public class CMISTest extends BaseCMISWebScriptTest } } + public void testQuery() + throws Exception + { + // retrieve query collection + IRI queryHREF = getQueryCollection(getRepository()); + + // retrieve test folder for query + Entry testFolder = createTestFolder("testQuery"); + CMISProperties testFolderProps = testFolder.getExtension(CMISConstants.PROPERTIES); + Link childrenLink = testFolder.getLink(CMISConstants.REL_CHILDREN); + + // create documents query + Entry document1 = createDocument(childrenLink.getHref(), "apple1"); + assertNotNull(document1); + CMISProperties document1Props = document1.getExtension(CMISConstants.PROPERTIES); + assertNotNull(document1Props); + String doc2name = "name" + System.currentTimeMillis(); + Entry document2 = createDocument(childrenLink.getHref(), doc2name); + assertNotNull(document2); + CMISProperties document2Props = document2.getExtension(CMISConstants.PROPERTIES); + assertNotNull(document2Props); + Entry document3 = createDocument(childrenLink.getHref(), "banana1"); + assertNotNull(document3); + + // TODO: query based on query capabilities + String queryDoc = loadString("/cmis/rest/query.cmissqlquery.xml"); + + { + // construct structured query + String query = "SELECT OBJECT_ID, OBJECT_TYPE_ID, NAME FROM DOCUMENT_OBJECT_TYPE " + + "WHERE IN_FOLDER('" + testFolderProps.getObjectId() + "') " + + "AND NAME = 'apple1'"; + String queryReq = queryDoc.replace("${STATEMENT}", query); + queryReq = queryReq.replace("${PAGESIZE}", "5"); + + // issue structured query + Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), "application/cmisrequest+xml;type=query"), 200, getAtomValidator()); + assertNotNull(queryRes); + Feed queryFeed = abdera.parseFeed(new StringReader(queryRes.getContentAsString()), null); + assertNotNull(queryFeed); + assertEquals(1, queryFeed.getEntries().size()); + assertNotNull(queryFeed.getEntry(document1.getId().toString())); + CMISProperties result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.PROPERTIES); + assertEquals(document1Props.getName(), result1.findPropertyString("NAME")); + assertEquals(document1Props.getObjectId(), result1.findPropertyID("OBJECT_ID")); + assertEquals(document1Props.getObjectType(), result1.findPropertyID("OBJECT_TYPE_ID")); + } + + if (fulltextCapability.equals("fulltextonly") || fulltextCapability.equals("fulltextandstructured")) + { + // construct fulltext query + String query = "SELECT OBJECT_ID, OBJECT_TYPE_ID, NAME FROM DOCUMENT_OBJECT_TYPE " + + "WHERE CONTAINS('" + doc2name + "')"; + String queryReq = queryDoc.replace("${STATEMENT}", query); + queryReq = queryReq.replace("${PAGESIZE}", "5"); + + // issue fulltext query + Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), "application/cmisrequest+xml;type=query"), 200, getAtomValidator()); + assertNotNull(queryRes); + Feed queryFeed = abdera.parseFeed(new StringReader(queryRes.getContentAsString()), null); + assertNotNull(queryFeed); + assertEquals(1, queryFeed.getEntries().size()); + assertNotNull(queryFeed.getEntry(document2.getId().toString())); + CMISProperties result1 = queryFeed.getEntry(document2.getId().toString()).getExtension(CMISConstants.PROPERTIES); + assertEquals(document2Props.getName(), result1.findPropertyString("NAME")); + assertEquals(document2Props.getObjectId(), result1.findPropertyID("OBJECT_ID")); + assertEquals(document2Props.getObjectType(), result1.findPropertyID("OBJECT_TYPE_ID")); + } + + if (fulltextCapability.equals("fulltextandstructured")) + { + // construct fulltext and structured query + String query = "SELECT OBJECT_ID, OBJECT_TYPE_ID, NAME FROM DOCUMENT_OBJECT_TYPE " + + "WHERE IN_FOLDER('" + testFolderProps.getObjectId() + "') " + + "AND NAME = 'apple1'" + + "AND CONTAINS('test content')"; + String queryReq = queryDoc.replace("${STATEMENT}", query); + queryReq = queryReq.replace("${PAGESIZE}", "5"); + + // issue structured query + Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), "application/cmisrequest+xml;type=query"), 200, getAtomValidator()); + assertNotNull(queryRes); + Feed queryFeed = abdera.parseFeed(new StringReader(queryRes.getContentAsString()), null); + assertNotNull(queryFeed); + assertEquals(1, queryFeed.getEntries().size()); + assertNotNull(queryFeed.getEntry(document1.getId().toString())); + CMISProperties result1 = queryFeed.getEntry(document1.getId().toString()).getExtension(CMISConstants.PROPERTIES); + assertEquals(document1Props.getName(), result1.findPropertyString("NAME")); + assertEquals(document1Props.getObjectId(), result1.findPropertyID("OBJECT_ID")); + assertEquals(document1Props.getObjectType(), result1.findPropertyID("OBJECT_TYPE_ID")); + } + } + // public void testUnfiled() // { // } diff --git a/source/java/org/alfresco/repo/cmis/rest/TestRemoteCMIS.java b/source/java/org/alfresco/repo/cmis/rest/TestRemoteCMIS.java index 63ec211565..082255a9f2 100644 --- a/source/java/org/alfresco/repo/cmis/rest/TestRemoteCMIS.java +++ b/source/java/org/alfresco/repo/cmis/rest/TestRemoteCMIS.java @@ -64,6 +64,7 @@ public class TestRemoteCMIS extends CMISTest * * args[0] = serverUrl * args[1] = username/password + * args[2] = [params=url|headers] * * @param args args */ @@ -84,12 +85,28 @@ public class TestRemoteCMIS extends CMISTest } } - // execute cmis tests with url arguments - TestRunner.run(new TestSuite(TestRemoteCMIS.class)); + String params = "both"; + if (args.length > 2) + { + String[] paramSegment = args[1].split("="); + if (paramSegment[0].equalsIgnoreCase("params")) + { + params = paramSegment[1].toLowerCase(); + } + } + + // execute cmis tests with url arguments + if (params.equals("both") || params.equals("url")) + { + TestRunner.run(new TestSuite(TestRemoteCMIS.class)); + } // execute cmis tests with headers - argsAsHeaders = true; - TestRunner.run(new TestSuite(TestRemoteCMIS.class)); + if (params.equals("both") || params.equals("headers")) + { + argsAsHeaders = true; + TestRunner.run(new TestSuite(TestRemoteCMIS.class)); + } } } diff --git a/source/java/org/alfresco/repo/cmis/ws/AuthenticationTokenCallbackHandler.java b/source/java/org/alfresco/repo/cmis/ws/AuthenticationTokenCallbackHandler.java index 6aa6cf12be..2b0ef7f2d0 100644 --- a/source/java/org/alfresco/repo/cmis/ws/AuthenticationTokenCallbackHandler.java +++ b/source/java/org/alfresco/repo/cmis/ws/AuthenticationTokenCallbackHandler.java @@ -31,8 +31,6 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; import org.alfresco.service.cmr.security.AuthenticationService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.ws.security.WSPasswordCallback; /** @@ -41,8 +39,6 @@ import org.apache.ws.security.WSPasswordCallback; public class AuthenticationTokenCallbackHandler implements CallbackHandler { - private final Log LOG = LogFactory.getLog(AuthenticationTokenCallbackHandler.class); - private AuthenticationService authenticationService; public void setAuthenticationService(AuthenticationService authenticationService) diff --git a/source/java/org/alfresco/repo/cmis/ws/CMISPropNamesMapping.java b/source/java/org/alfresco/repo/cmis/ws/CMISPropNamesMapping.java new file mode 100755 index 0000000000..db5d2af59d --- /dev/null +++ b/source/java/org/alfresco/repo/cmis/ws/CMISPropNamesMapping.java @@ -0,0 +1,57 @@ + +package org.alfresco.repo.cmis.ws; + +import java.util.HashMap; +import java.util.Map; + +import org.alfresco.cmis.dictionary.CMISMapping; + +/** + * Mappings of CMIS properties to names in response + * + * @author Dmitry Lazurkin + * + */ +public class CMISPropNamesMapping +{ + private static Map cmisPropertiesNamesMapping = new HashMap(); + + static + { + cmisPropertiesNamesMapping.put(CMISMapping.PROP_IS_IMMUTABLE, "isImmutable"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_IS_LATEST_VERSION, "isLatestVersion"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_IS_MAJOR_VERSION, "isMajorVersion"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_IS_LATEST_MAJOR_VERSION, "isLatestMajorVersion"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT, "versionSeriesIsCheckedOut"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CREATION_DATE, "creationDate"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_LAST_MODIFICATION_DATE, "lastModificationDate"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_OBJECT_ID, "objectID"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_VERSION_SERIES_ID, "versionSeriesID"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID, "versionSeriesCheckedOutID"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CONTENT_STREAM_LENGTH, "contentStreamLength"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_NAME, "name"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_OBJECT_TYPE_ID, "objectTypeID"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CREATED_BY, "createdBy"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_LAST_MODIFIED_BY, "lastModifiedBy"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CONTENT_STREAM_MIME_TYPE, "contentStreamMimeType"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CONTENT_STREAM_FILENAME, "contentStreamFileName"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_VERSION_LABEL, "versionLabel"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY, "versionSeriesCheckedOutBy"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CHECKIN_COMMENT, "checkinComment"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_CONTENT_STREAM_URI, "contentStreamURI"); + cmisPropertiesNamesMapping.put(CMISMapping.PROP_PARENT, "parent"); + } + + /** + * Get property name in response + * + * @param internalName internal property name + * @return property name in response + */ + public static String getResponsePropertyName(String internalName) + { + //return cmisPropertiesNamesMapping.get(internalName); + return internalName; + } + +} diff --git a/source/java/org/alfresco/repo/cmis/ws/CmisProperty.java b/source/java/org/alfresco/repo/cmis/ws/CmisProperty.java deleted file mode 100644 index 2bfb2b93a2..0000000000 --- a/source/java/org/alfresco/repo/cmis/ws/CmisProperty.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2005-2008 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.repo.cmis.ws; - -/** - * Cmis properties enumeration - * - * @author Dmitry Lazurkin - * - */ -public enum CmisProperty -{ - // Base properties - OBJECT_ID, - URI, - OBJECT_TYPE_ID, - CREATED_BY, - CREATION_DATE, - LAST_MODIFIED_BY, - LAST_MODIFICATION_DATE, - CHANGE_TOKEN, - - // Folder Object Type properties - PARENT, - ALLOWED_CHILD_OBJECT_TYPES, - - // Document Object Type properties - IS_IMMUTABLE, - IS_LATEST_VERSION, - IS_MAJOR_VERSION, - IS_LATEST_MAJOR_VERSION, - VERSION_SERIES_IS_CHECKED_OUT, - VERSION_SERIES_CHECKED_OUT_BY, - VERSION_SERIES_CHECKED_OUT_OID, - CHECKIN_COMMENT, - CONTENT_STREAM_ALLOWED, - CONTENT_STREAM_LENGTH, - CONTENT_STREAM_MIME_TYPE, - CONTENT_STREAM_FILENAME, - CONTENT_STREAM_URI, - - // Document Object Type and Folder Object Type properties - NAME; -} diff --git a/source/java/org/alfresco/repo/cmis/ws/OIDType.java b/source/java/org/alfresco/repo/cmis/ws/ContentReaderDataSource.java old mode 100644 new mode 100755 similarity index 59% rename from source/java/org/alfresco/repo/cmis/ws/OIDType.java rename to source/java/org/alfresco/repo/cmis/ws/ContentReaderDataSource.java index 174354148e..4f6f716040 --- a/source/java/org/alfresco/repo/cmis/ws/OIDType.java +++ b/source/java/org/alfresco/repo/cmis/ws/ContentReaderDataSource.java @@ -24,28 +24,46 @@ */ package org.alfresco.repo.cmis.ws; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.activation.DataSource; + +import org.alfresco.service.cmr.repository.ContentReader; + /** - * OID types enumeration - * * @author Dmitry Lazurkin * */ -public enum OIDType +public class ContentReaderDataSource implements DataSource { - DOCUMENT_FOLDER, - RELATIONSHIP; + private ContentReader contentReader; + private String name; - public static OIDType getOIDType(String oid) + public ContentReaderDataSource(ContentReader contentReader, String name) { - try - { - return OIDType.values()[Integer.parseInt(oid.substring(0, 1))]; - } - catch (Exception e) - { - // expected if OID string is bad - } + this.contentReader = contentReader; + this.name = name; + } + public String getContentType() + { + return contentReader.getMimetype(); + } + + public InputStream getInputStream() throws IOException + { + return contentReader.getContentInputStream(); + } + + public String getName() + { + return name; + } + + public OutputStream getOutputStream() throws IOException + { return null; } diff --git a/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java index f1d25014a4..e4957ae887 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMAbstractServicePort.java @@ -28,55 +28,47 @@ import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.GregorianCalendar; -import java.util.Map; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.service.cmr.coci.CheckOutCheckInService; -import org.alfresco.service.cmr.dictionary.DictionaryService; +import org.alfresco.cmis.CMISService; +import org.alfresco.cmis.dictionary.CMISDictionaryService; +import org.alfresco.cmis.dictionary.CMISMapping; +import org.alfresco.cmis.property.CMISPropertyService; +import org.alfresco.cmis.search.CMISQueryService; +import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.service.cmr.model.FileFolderService; -import org.alfresco.service.cmr.repository.AssociationRef; -import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; -import org.alfresco.service.cmr.repository.datatype.TypeConverter; -import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.cmr.security.AuthenticationService; -import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionHistory; import org.alfresco.service.cmr.version.VersionService; import org.alfresco.service.cmr.version.VersionType; -import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.descriptor.DescriptorService; import org.alfresco.service.namespace.QName; /** + * Base class for all CMIS web services + * * @author Michael Shavnev * @author Dmitry Lazurkin */ public class DMAbstractServicePort { - - private static final TypeConverter TYPE_CONVERTER = DefaultTypeConverter.INSTANCE; - private DatatypeFactory _datatypeFactory; + protected CMISDictionaryService cmisDictionaryService; + protected CMISQueryService cmisQueryService; + protected CMISService cmisService; + protected CMISPropertyService cmisPropertyService; + protected DescriptorService descriptorService; protected NodeService nodeService; - protected PersonService personService; - protected SearchService searchService; - protected NamespaceService namespaceService; - protected DictionaryService dictionaryService; protected VersionService versionService; - protected CheckOutCheckInService checkOutCheckInService; protected FileFolderService fileFolderService; - protected AuthenticationService authenticationService; - private DatatypeFactory getDatatypeFactory() throws RuntimeException + private DatatypeFactory getDatatypeFactory() { if (_datatypeFactory == null) { @@ -86,373 +78,165 @@ public class DMAbstractServicePort } catch (DatatypeConfigurationException e) { - // TODO: error code - throw new RuntimeException(e.getMessage()); + // suppress } } return _datatypeFactory; } - public void setNodeService(NodeService nodeService) + protected NodeRef getNodeRefFromOID(String oid) throws InvalidArgumentException { - this.nodeService = nodeService; + NodeRef nodeRef; + + try + { + nodeRef = new NodeRef(oid); + } + catch (AlfrescoRuntimeException e) + { + // TODO: error code + throw new InvalidArgumentException("Invalid OID value", ExceptionUtils.createBasicFault(null, "Invalid OID value")); + } + + return nodeRef; } - public void setPersonService(PersonService personService) + private void addBooleanProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.personService = personService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyBooleanType propBoolean = new PropertyBooleanType(); + propBoolean.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propBoolean.setValue((Boolean) value); + properties.getPropertyBoolean().add(propBoolean); + } } - public void setSearchService(SearchService searchService) + private void addDateTimeProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.searchService = searchService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyDateTimeType propDateTime = new PropertyDateTimeType(); + propDateTime.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propDateTime.setValue(convert((Date) value)); + properties.getPropertyDateTime().add(propDateTime); + } } - public void setNamespaceService(NamespaceService namespaceService) + private void addIDProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.namespaceService = namespaceService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyIDType propID = new PropertyIDType(); + propID.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propID.setValue(value.toString()); + properties.getPropertyID().add(propID); + } } - public void setDictionaryService(DictionaryService dictionaryService) + private void addIntegerProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.dictionaryService = dictionaryService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyIntegerType propInteger = new PropertyIntegerType(); + propInteger.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propInteger.setValue(BigInteger.valueOf((Long) value)); + properties.getPropertyInteger().add(propInteger); + } } - public void setVersionService(VersionService versionService) + private void addStringProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.versionService = versionService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyStringType propString = new PropertyStringType(); + propString.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propString.setValue(value.toString()); + properties.getPropertyString().add(propString); + } } - public void setCheckOutCheckInService(CheckOutCheckInService checkOutCheckInService) + private void addStringProperty(PropertiesType properties, PropertyFilter filter, String name, String value) { - this.checkOutCheckInService = checkOutCheckInService; + if (filter.allow(name) && value != null) + { + PropertyStringType propString = new PropertyStringType(); + propString.setName(name); + propString.setValue(value); + properties.getPropertyString().add(propString); + } } - public void setFileFolderService(FileFolderService fileFolderService) + private void addURIProperty(PropertiesType properties, PropertyFilter filter, String name, NodeRef nodeRef) { - this.fileFolderService = fileFolderService; - } - - public void setAuthenticationService(AuthenticationService authenticationService) - { - this.authenticationService = authenticationService; + Serializable value = cmisPropertyService.getProperty(nodeRef, name); + if (filter.allow(name) && value != null) + { + PropertyURIType propString = new PropertyURIType(); + propString.setName(CMISPropNamesMapping.getResponsePropertyName(name)); + propString.setValue(value.toString()); + properties.getPropertyURI().add(propString); + } } /** - * Sets properties for ObjectTypeBase object + * Get CMIS properties for object * - * @param nodeRef Node reference - * @param target ObjectTypeBase object for setting - * @param propertyFilter filter for properties - * @return ObjectTypeBase object + * @param nodeRef node reference + * @param filter property filter + * @return properties */ - public ObjectTypeBase setObjectTypeBaseProperties(NodeRef nodeRef, ObjectTypeBase target, PropertyFilter propertyFilter) throws RuntimeException + public PropertiesType getPropertiesType(NodeRef nodeRef, PropertyFilter filter) { - Map properties = nodeService.getProperties(nodeRef); + CMISMapping cmisMapping = cmisDictionaryService.getCMISMapping(); + QName cmisType = cmisMapping.getCmisType(nodeService.getType(nodeRef)); - target.setObjectID(OIDUtils.toOID(nodeRef)); + PropertiesType properties = new PropertiesType(); - QName typeQName = nodeService.getType(nodeRef); - target.setObjectTypeID(typeQName.toString()); - - if (dictionaryService.isSubClass(typeQName, ContentModel.TYPE_FOLDER)) + if (cmisMapping.isValidCmisDocument(cmisType)) { - target.setBaseObjectType(ContentModel.TYPE_FOLDER.toString()); + addBooleanProperty(properties, filter, CMISMapping.PROP_IS_IMMUTABLE, nodeRef); + addBooleanProperty(properties, filter, CMISMapping.PROP_IS_LATEST_VERSION, nodeRef); + addBooleanProperty(properties, filter, CMISMapping.PROP_IS_MAJOR_VERSION, nodeRef); + addBooleanProperty(properties, filter, CMISMapping.PROP_IS_LATEST_MAJOR_VERSION, nodeRef); + addBooleanProperty(properties, filter, CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT, nodeRef); + addDateTimeProperty(properties, filter, CMISMapping.PROP_CREATION_DATE, nodeRef); + addDateTimeProperty(properties, filter, CMISMapping.PROP_LAST_MODIFICATION_DATE, nodeRef); + addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_ID, nodeRef); + addIDProperty(properties, filter, CMISMapping.PROP_VERSION_SERIES_ID, nodeRef); + addIDProperty(properties, filter, CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID, nodeRef); + addIntegerProperty(properties, filter, CMISMapping.PROP_CONTENT_STREAM_LENGTH, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_NAME, nodeRef); + addStringProperty(properties, filter, "baseType", "document"); + addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_TYPE_ID, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_CREATED_BY, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_LAST_MODIFIED_BY, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_CONTENT_STREAM_MIME_TYPE, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_CONTENT_STREAM_FILENAME, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_VERSION_LABEL, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_CHECKIN_COMMENT, nodeRef); + addURIProperty(properties, filter, CMISMapping.PROP_CONTENT_STREAM_URI, nodeRef); } - else + else if (cmisMapping.isValidCmisFolder(cmisType)) { - target.setBaseObjectType(ContentModel.TYPE_CONTENT.toString()); + addDateTimeProperty(properties, filter, CMISMapping.PROP_CREATION_DATE, nodeRef); + addDateTimeProperty(properties, filter, CMISMapping.PROP_LAST_MODIFICATION_DATE, nodeRef); + addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_ID, nodeRef); + addIDProperty(properties, filter, CMISMapping.PROP_PARENT, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_NAME, nodeRef); + addStringProperty(properties, filter, "baseType", "folder"); + addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_TYPE_ID, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_CREATED_BY, nodeRef); + addStringProperty(properties, filter, CMISMapping.PROP_LAST_MODIFIED_BY, nodeRef); } - if (propertyFilter.allow(CmisProperty.CREATED_BY)) - { - target.setCreatedBy(TYPE_CONVERTER.convert(String.class, properties.get(ContentModel.PROP_AUTHOR))); - } - - if (propertyFilter.allow(CmisProperty.CREATION_DATE)) - { - target.setCreationDate(convert(TYPE_CONVERTER.convert(Date.class, properties.get(ContentModel.PROP_CREATED)))); - } - - if (propertyFilter.allow(CmisProperty.LAST_MODIFIED_BY)) - { - target.setLastModifiedBy(TYPE_CONVERTER.convert(String.class, properties.get(ContentModel.PROP_MODIFIER))); - } - - Date modificationDate = TYPE_CONVERTER.convert(Date.class, properties.get(ContentModel.PROP_MODIFIED)); - - if (propertyFilter.allow(CmisProperty.LAST_MODIFICATION_DATE)) - { - target.setLastModificationDate(convert(modificationDate)); - } - - if (propertyFilter.allow(CmisProperty.CHANGE_TOKEN)) - { - target.setChangeToken(String.valueOf(modificationDate.getTime())); - } - - return target; - } - - /** - * Sets properties for FolderObjectType object - * - * @param nodeRef Node reference - * @param target FolderObjectType object for setting - * @param propertyFilter filter for properties - * @return FolderObjectType object - */ - public FolderObjectType setFolderObjectTypeProperties(NodeRef folderNodeRef, FolderObjectType target, PropertyFilter propertyFilter) throws RuntimeException - { - setObjectTypeBaseProperties(folderNodeRef, target, propertyFilter); - - if (propertyFilter.allow(CmisProperty.NAME)) - { - target.setName((String) nodeService.getProperty(folderNodeRef, ContentModel.PROP_NAME)); - } - - if (propertyFilter.allow(CmisProperty.PARENT)) - { - target.setParent(OIDUtils.toOID(nodeService.getPrimaryParent(folderNodeRef).getParentRef())); - } - - if (propertyFilter.allow(CmisProperty.ALLOWED_CHILD_OBJECT_TYPES)) - { - // TODO: not set this property - } - - return target; - } - - /** - * Sets properties for DocumentOrFolderObjectType object - * - * @param nodeRef Node reference - * @param target DocumentOrFolderObjectType object for setting - * @param propertyFilter filter for properties - * @return DocumentOrFolderObjectType object - */ - public DocumentOrFolderObjectType setFolderObjectTypeProperties(NodeRef folderNodeRef, DocumentOrFolderObjectType target, PropertyFilter propertyFilter) throws RuntimeException - { - setObjectTypeBaseProperties(folderNodeRef, target, propertyFilter); - - if (propertyFilter.allow(CmisProperty.NAME)) - { - target.setName((String) nodeService.getProperty(folderNodeRef, ContentModel.PROP_NAME)); - } - - if (propertyFilter.allow(CmisProperty.PARENT)) - { - target.setParent(OIDUtils.toOID(nodeService.getPrimaryParent(folderNodeRef).getParentRef())); - } - - if (propertyFilter.allow(CmisProperty.ALLOWED_CHILD_OBJECT_TYPES)) - { - // TODO: not set this property - } - - return target; - } - - /** - * Sets properties for DocumentObjectType object - * - * @param nodeRef Node reference - * @param target DocumentObjectType object for setting - * @param propertyFilter filter for properties - * @return DocumentObjectType object - */ - public DocumentObjectType setDocumentObjectTypeProperties(NodeRef documentNodeRef, DocumentObjectType target, PropertyFilter propertyFilter) throws RuntimeException - { - setObjectTypeBaseProperties(documentNodeRef, target, propertyFilter); - - NodeRef workingCopy = null; - - if (nodeService.hasAspect(documentNodeRef, ContentModel.ASPECT_WORKING_COPY)) - { - workingCopy = documentNodeRef; - - if (propertyFilter.allow(CmisProperty.IS_LATEST_VERSION)) - { - target.setIsLatestVersion(false); - } - - if (propertyFilter.allow(CmisProperty.IS_MAJOR_VERSION)) - { - target.setIsMajorVersion(false); - } - - if (propertyFilter.allow(CmisProperty.IS_LATEST_MAJOR_VERSION)) - { - target.setIsLatestMajorVersion(false); - } - } - else - { - target.setName((String) nodeService.getProperty(documentNodeRef, ContentModel.PROP_NAME)); - - workingCopy = checkOutCheckInService.getWorkingCopy(documentNodeRef); - - Version version = versionService.getCurrentVersion(documentNodeRef); - - if (nodeService.hasAspect(documentNodeRef, ContentModel.ASPECT_VERSIONABLE) && version != null) - { - if (propertyFilter.allow(CmisProperty.IS_LATEST_VERSION)) - { - target.setIsLatestVersion(version.getVersionedNodeRef().equals(documentNodeRef)); - } - - if (propertyFilter.allow(CmisProperty.IS_MAJOR_VERSION)) - { - target.setIsMajorVersion(version.getVersionType().equals(VersionType.MAJOR)); - } - - if (propertyFilter.allow(CmisProperty.IS_LATEST_MAJOR_VERSION)) - { - NodeRef latestMajorNodeRef = getLatestVersionNodeRef(documentNodeRef, true); - target.setIsLatestMajorVersion(latestMajorNodeRef.equals(documentNodeRef)); - } - - if (propertyFilter.allow(CmisProperty.CHECKIN_COMMENT) && workingCopy == null) - { - target.setCheckinComment(version.getDescription()); - } - } - else - { - if (propertyFilter.allow(CmisProperty.IS_LATEST_VERSION)) - { - target.setIsLatestVersion(true); - } - if (propertyFilter.allow(CmisProperty.IS_MAJOR_VERSION)) - { - target.setIsMajorVersion(true); - } - if (propertyFilter.allow(CmisProperty.IS_LATEST_MAJOR_VERSION)) - { - target.setIsLatestMajorVersion(true); - } - } - } - - if (propertyFilter.allow(CmisProperty.VERSION_SERIES_IS_CHECKED_OUT)) - { - target.setVersionSeriesIsCheckedOut(workingCopy != null); - } - - if (propertyFilter.allow(CmisProperty.VERSION_SERIES_CHECKED_OUT_BY) && workingCopy != null) - { - target.setVersionSeriesCheckedOutBy((String) nodeService.getProperty(workingCopy, ContentModel.PROP_WORKING_COPY_OWNER)); - } - - if (propertyFilter.allow(CmisProperty.VERSION_SERIES_CHECKED_OUT_OID) && workingCopy != null) - { - if (AuthenticationUtil.getCurrentUserName().equals((String) nodeService.getProperty(workingCopy, ContentModel.PROP_WORKING_COPY_OWNER))) - { - target.setVersionSeriesCheckedOutOID(OIDUtils.toOID(workingCopy)); - } - } - - ContentReader contentReader = null; - - if (nodeService.getType(documentNodeRef).equals(ContentModel.TYPE_LINK)) - { - NodeRef destRef = (NodeRef) nodeService.getProperty(documentNodeRef, ContentModel.PROP_LINK_DESTINATION); - if (nodeService.exists(destRef)) - { - contentReader = fileFolderService.getReader(destRef); - } - } - else - { - contentReader = fileFolderService.getReader(documentNodeRef); - } - - if (contentReader != null) - { - if (propertyFilter.allow(CmisProperty.CONTENT_STREAM_LENGTH)) - { - target.setContentStreamLength(BigInteger.valueOf(contentReader.getSize())); - } - if (propertyFilter.allow(CmisProperty.CONTENT_STREAM_MIME_TYPE)) - { - target.setContentStreamMimeType(contentReader.getMimetype()); - } - if (propertyFilter.allow(CmisProperty.CONTENT_STREAM_FILENAME)) - { - target.setContentStreamFilename(target.getName()); // TODO: right on not? - } - } - - return target; - } - - /** - * Sets properties for RelationshipObjectType object - * - * @param associationRef Association reference - * @param target RelationshipObjectType object for setting - * @param propertyFilter filter for properties - * @return RelationshipObjectType object - */ - public RelationshipObjectType setRelationshipObjectTypeProperties(AssociationRef associationRef, RelationshipObjectType target, PropertyFilter propertyFilter) - { - target.setSourceOID(OIDUtils.toOID(associationRef.getSourceRef())); - target.setTargetOID(OIDUtils.toOID(associationRef.getTargetRef())); - // TODO: other properties - return target; - } - - /** - * Sets properties for DocumentFolderOrRelationshipObjectType object - * - * @param associationRef Association reference - * @param target DocumentFolderOrRelationshipObjectType object for setting - * @param propertyFilter filter for properties - * @return DocumentFolderOrRelationshipObjectType object - */ - public DocumentFolderOrRelationshipObjectType setRelationshipObjectTypeProperties(AssociationRef associationRef, DocumentFolderOrRelationshipObjectType target, PropertyFilter propertyFilter) - { - target.setSourceOID(OIDUtils.toOID(associationRef.getSourceRef())); - target.setTargetOID(OIDUtils.toOID(associationRef.getTargetRef())); - // TODO: other properties - return target; - } - - /** - * @param associationRef a reference to the association to look for - * @return Returns true if the association exists, otherwise false - */ - public boolean exists(AssociationRef associationRef) - { - if (nodeService.exists(associationRef.getSourceRef())) - { - return nodeService.getTargetAssocs(associationRef.getSourceRef(), associationRef.getTypeQName()).contains(associationRef); - } - - return false; - } - - /** - * @param nodeRef - * @return - */ - public boolean isFolderType(NodeRef nodeRef) - { - QName typeQName = nodeService.getType(nodeRef); - - return dictionaryService.isSubClass(typeQName, ContentModel.TYPE_FOLDER); - } - - /** - * @param nodeRef - * @return - */ - public boolean isDocumentType(NodeRef nodeRef) - { - QName typeQName = nodeService.getType(nodeRef); - - return dictionaryService.isSubClass(typeQName, ContentModel.TYPE_CONTENT); + return properties; } /** @@ -482,7 +266,8 @@ public class DMAbstractServicePort do { latestVersion = versionHistory.getPredecessor(latestVersion); - } while (latestVersion.getVersionType().equals(VersionType.MAJOR) == false); + } + while (latestVersion.getVersionType().equals(VersionType.MAJOR) == false); latestVersionNodeRef = latestVersion.getFrozenStateNodeRef(); } @@ -497,13 +282,52 @@ public class DMAbstractServicePort * * @param date Date object * @return XMLGregorianCalendar object - * @throws RuntimeException */ - private XMLGregorianCalendar convert(Date date) throws RuntimeException + private XMLGregorianCalendar convert(Date date) { GregorianCalendar calendar = new GregorianCalendar(); calendar.setTime(date); return getDatatypeFactory().newXMLGregorianCalendar(calendar); } + public void setCmisService(CMISService cmisService) + { + this.cmisService = cmisService; + } + + public void setCmisPropertyService(CMISPropertyService cmisPropertyService) + { + this.cmisPropertyService = cmisPropertyService; + } + + public void setCmisDictionaryService(CMISDictionaryService cmisDictionaryService) + { + this.cmisDictionaryService = cmisDictionaryService; + } + + public void setCmisQueryService(CMISQueryService cmisQueryService) + { + this.cmisQueryService = cmisQueryService; + } + + public void setDescriptorService(DescriptorService descriptorService) + { + this.descriptorService = descriptorService; + } + + public void setNodeService(NodeService nodeService) + { + this.nodeService = nodeService; + } + + public void setVersionService(VersionService versionService) + { + this.versionService = versionService; + } + + public void setFileFolderService(FileFolderService fileFolderService) + { + this.fileFolderService = fileFolderService; + } + } diff --git a/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java index 41f571acbc..625e58d3d6 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMNavigationServicePort.java @@ -27,113 +27,67 @@ package org.alfresco.repo.cmis.ws; import java.math.BigInteger; import java.util.List; -import org.alfresco.service.cmr.model.FileInfo; +import org.alfresco.cmis.CMISService.TypesFilter; +import org.alfresco.cmis.dictionary.CMISMapping; import org.alfresco.service.cmr.repository.NodeRef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** + * Port for navigation service + * * @author Dmitry Lazurkin */ @javax.jws.WebService(name = "NavigationServicePort", serviceName = "NavigationService", portName = "NavigationServicePort", targetNamespace = "http://www.cmis.org/ns/1.0", endpointInterface = "org.alfresco.repo.cmis.ws.NavigationServicePort") public class DMNavigationServicePort extends DMAbstractServicePort implements NavigationServicePort { - private static final Log log = LogFactory.getLog("org.alfresco.repo.cmis.ws"); - public org.alfresco.repo.cmis.ws.GetDescendantsResponse getDescendants(GetDescendants parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException + public GetCheckedoutDocsResponse getCheckedoutDocs(GetCheckedoutDocs parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, + ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.GetDescendantsResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new FilterNotValidException("FilterNotValidException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } - public org.alfresco.repo.cmis.ws.GetCheckedoutDocsResponse getCheckedoutDocs(GetCheckedoutDocs parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException + /** + * Asserts "Folder with folderNodeRef exists" + * + * @param folderNodeRef node reference + * @throws FolderNotValidException folderNodeRef doesn't exist or folderNodeRef isn't for folder object + */ + private void assertExistFolder(NodeRef folderNodeRef) throws FolderNotValidException { - System.out.println(parameters); - try + CMISMapping cmisMapping = cmisDictionaryService.getCMISMapping(); + if (folderNodeRef == null || nodeService.exists(folderNodeRef) == false || cmisMapping.isValidCmisFolder(cmisMapping.getCmisType(nodeService.getType(folderNodeRef))) == false) { - org.alfresco.repo.cmis.ws.GetCheckedoutDocsResponse _return = null; - return _return; + // TODO: error code + throw new FolderNotValidException("OID for non-existent object or not folder object", ExceptionUtils.createBasicFault(null, "OID for non-existent object or not folder object")); } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new FilterNotValidException("FilterNotValidException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); } - public org.alfresco.repo.cmis.ws.GetDocumentParentsResponse getDocumentParents(GetDocumentParents parameters) throws RuntimeException, ConcurrencyException, - InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException - { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.GetDocumentParentsResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new FilterNotValidException("FilterNotValidException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public org.alfresco.repo.cmis.ws.GetChildrenResponse getChildren(GetChildren parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException + public GetChildrenResponse getChildren(GetChildren parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, + FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { PropertyFilter propertyFilter = new PropertyFilter(parameters.getFilter()); - NodeRef folderNodeRef = OIDUtils.OIDtoNodeRef(parameters.getFolderId()); - + NodeRef folderNodeRef = getNodeRefFromOID(parameters.getFolderId()); assertExistFolder(folderNodeRef); - List listing; - if (parameters.getType().equals(TypesOfObjectsEnum.DOCUMENTS)) + NodeRef[] listing = null; + switch (parameters.getType()) { - listing = fileFolderService.listFiles(folderNodeRef); - } - else if (parameters.getType().equals(TypesOfObjectsEnum.FOLDERS)) - { - listing = fileFolderService.listFolders(folderNodeRef); - } - else - { - listing = fileFolderService.list(folderNodeRef); + case DOCUMENTS: + listing = cmisService.getChildren(folderNodeRef, TypesFilter.Documents); + break; + case FOLDERS: + listing = cmisService.getChildren(folderNodeRef, TypesFilter.Folders); + break; + case POLICIES: + throw new OperationNotSupportedException("Policies listing isn't supported", ExceptionUtils.createBasicFault(null, "Policies listing isn't supported")); + case ANY: + listing = cmisService.getChildren(folderNodeRef, TypesFilter.Any); + break; } - int maxItems = listing.size(); + int maxItems = listing.length; int skipCount = 0; GetChildrenResponse response = new GetChildrenResponse(); @@ -152,94 +106,42 @@ public class DMNavigationServicePort extends DMAbstractServicePort implements Na if (maxItems == 0) { - maxItems = listing.size(); + maxItems = listing.length; } - response.setHasMoreItems(maxItems < listing.size()); + response.setHasMoreItems(maxItems < listing.length); } - response.setDocumentAndFolderCollection(new DocumentAndFolderCollection()); - List resultListing = response.getDocumentAndFolderCollection().getObject(); + response.setChildren(new ChildrenType()); + List resultListing = response.getChildren().getChild(); - for (int index = skipCount; index < listing.size() && maxItems > 0; ++index, --maxItems) + for (int index = skipCount; index < listing.length && maxItems > 0; ++index, --maxItems) { - FileInfo currentFileInfo = listing.get(index); - DocumentOrFolderObjectType documentOrFolderObjectType = new DocumentOrFolderObjectType(); - - if (currentFileInfo.isFolder()) - { - setFolderObjectTypeProperties(currentFileInfo.getNodeRef(), documentOrFolderObjectType, propertyFilter); - } - else - { - setDocumentObjectTypeProperties(currentFileInfo.getNodeRef(), documentOrFolderObjectType, propertyFilter); - } - - resultListing.add(documentOrFolderObjectType); + NodeRef currentFileInfo = listing[index]; + FolderTreeType folderTreeType = new FolderTreeType(); + folderTreeType.setProperties(getPropertiesType(currentFileInfo, propertyFilter)); + resultListing.add(folderTreeType); } return response; } - /** - * Asserts "Folder with folderNodeRef exists" - * - * @param folderNodeRef node reference - * @throws FolderNotValidException folderNodeRef doesn't exist or folderNodeRef isn't for folder object - */ - private void assertExistFolder(NodeRef folderNodeRef) throws FolderNotValidException + public GetDescendantsResponse getDescendants(GetDescendants parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, + ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { - if (folderNodeRef == null || nodeService.exists(folderNodeRef) == false || isFolderType(folderNodeRef) == false) - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "OID for non-existent object or not folder object"); - throw new FolderNotValidException("OID for non-existent object or not folder object", basicFault); - } + return null; } - public org.alfresco.repo.cmis.ws.GetFolderParentResponse getFolderParent(GetFolderParent parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - FilterNotValidException, OperationNotSupportedException, FolderNotValidException, PermissionDeniedException + public GetFolderParentResponse getFolderParent(GetFolderParent parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, + ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.GetFolderParentResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new FilterNotValidException("FilterNotValidException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } - public org.alfresco.repo.cmis.ws.GetUnfiledDocsResponse getUnfiledDocs(GetUnfiledDocs parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - FilterNotValidException, OperationNotSupportedException, PermissionDeniedException + public GetObjectParentsResponse getObjectParents(GetObjectParents parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, + ConstraintViolationException, FilterNotValidException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.GetUnfiledDocsResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new FilterNotValidException("FilterNotValidException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } } diff --git a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java index d2f22e511e..8be230a8a5 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMObjectServicePort.java @@ -24,436 +24,171 @@ */ package org.alfresco.repo.cmis.ws; -import java.io.IOException; -import java.io.InputStream; import java.math.BigInteger; -import org.alfresco.model.ContentModel; -import org.alfresco.service.cmr.repository.AssociationRef; +import javax.activation.DataHandler; +import javax.xml.ws.Holder; + +import org.alfresco.cmis.dictionary.CMISMapping; +import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.NodeRef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.alfresco.service.namespace.QName; /** + * Port for object service + * * @author Dmitry Lazurkin */ @javax.jws.WebService(name = "ObjectServicePort", serviceName = "ObjectService", portName = "ObjectServicePort", targetNamespace = "http://www.cmis.org/ns/1.0", endpointInterface = "org.alfresco.repo.cmis.ws.ObjectServicePort") public class DMObjectServicePort extends DMAbstractServicePort implements ObjectServicePort { - private static final Log log = LogFactory.getLog("org.alfresco.repo.cmis.ws"); - public org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete deleteTree(java.lang.String folderId, org.alfresco.repo.cmis.ws.DeleteWithMultiFilingEnum unfileMultiFiledDocuments, - java.lang.Boolean continueOnFailure) throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, FolderNotValidException, + public CreateDocumentResponse createDocument(CreateDocument parameters) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, StorageException, + ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, FolderNotValidException, PermissionDeniedException + { + return null; + } + + public String createFolder(String repositoryId, String typeId, PropertiesType properties, String folderId) throws RuntimeException, InvalidArgumentException, + TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException + { + return null; + } + + public String createPolicy(String repositoryId, String typeId, PropertiesType properties, String folderId) throws RuntimeException, InvalidArgumentException, + TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException + { + return null; + } + + public String createRelationship(String repositoryId, String typeId, PropertiesType properties, String sourceObjectId, String targetObjectId) throws RuntimeException, + InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException { - System.out.println(folderId); - System.out.println(unfileMultiFiledDocuments); - System.out.println(continueOnFailure); - try - { - org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } - public org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionCollection getAllowableActions(java.lang.String objectId, java.lang.String asUser) - throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, PermissionDeniedException + public void deleteContentStream(String repositoryId, String documentId) throws RuntimeException, InvalidArgumentException, VersioningException, ObjectNotFoundException, + StorageException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, PermissionDeniedException { - System.out.println(objectId); - System.out.println(asUser); - try - { - org.alfresco.repo.cmis.ws.GetAllowableActionsResponse.AllowableActionCollection _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); } - public void moveObject(java.lang.String objectId, java.lang.String folderId, java.lang.String sourceFolderId) throws RuntimeException, ConcurrencyException, - InvalidArgumentException, ObjectNotFoundException, NotInFolderException, ConstraintViolationException, OperationNotSupportedException, FolderNotValidException, - PermissionDeniedException + public void deleteObject(String repositoryId, String objectId) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, + OperationNotSupportedException, UpdateConflictException, PermissionDeniedException { - System.out.println(objectId); - System.out.println(folderId); - System.out.println(sourceFolderId); - try - { - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new NotInFolderException("NotInFolderException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); } - public void deleteContentStream(java.lang.String documentId) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, - StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, PermissionDeniedException + public FailedToDelete deleteTree(String repositoryId, String folderId, UnfileNonfolderObjectsEnum unfileNonfolderObjects, Boolean continueOnFailure) throws RuntimeException, + InvalidArgumentException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, PermissionDeniedException { - System.out.println(documentId); - try - { - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new StorageException("StorageException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new StreamNotSupportedException("StreamNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } - public java.lang.String createFolder(java.lang.String typeId, org.alfresco.repo.cmis.ws.FolderObjectType propertyCollection, java.lang.String folderId) throws RuntimeException, - ConcurrencyException, InvalidArgumentException, TypeNotFoundException, ConstraintViolationException, OperationNotSupportedException, FolderNotValidException, - PermissionDeniedException + public AllowableActionsType getAllowableActions(String repositoryId, String objectId, String asUser) throws RuntimeException, InvalidArgumentException, + ObjectNotFoundException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException { - System.out.println(typeId); - System.out.println(propertyCollection); - System.out.println(folderId); - try - { - java.lang.String _return = ""; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new TypeNotFoundException("TypeNotFoundException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + return null; } - public void updateProperties(java.lang.String objectId, java.lang.String changeToken, org.alfresco.repo.cmis.ws.DocumentFolderOrRelationshipObjectType object) - throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, OperationNotSupportedException, PermissionDeniedException + public GetContentStreamResponse getContentStream(GetContentStream parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, StorageException, + OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, OffsetException, PermissionDeniedException { - System.out.println(objectId); - System.out.println(changeToken); - System.out.println(object); - try - { - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public org.alfresco.repo.cmis.ws.CreateDocumentResponse createDocument(CreateDocument parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - TypeNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, FolderNotValidException, - PermissionDeniedException - { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.CreateDocumentResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new TypeNotFoundException("TypeNotFoundException..."); - // throw new StorageException("StorageException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new StreamNotSupportedException("StreamNotSupportedException..."); - // throw new FolderNotValidException("FolderNotValidException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public byte[] getContentStream(java.lang.String documentId, java.math.BigInteger offset, java.math.BigInteger length) throws RuntimeException, ConcurrencyException, - InvalidArgumentException, ObjectNotFoundException, StorageException, OperationNotSupportedException, StreamNotSupportedException, OffsetException, - PermissionDeniedException - { - if (offset == null) - { - offset = new BigInteger("0"); - } - if (length == null) - { - length = new BigInteger("-1"); - } - - - NodeRef nodeRef = OIDUtils.OIDtoNodeRef(documentId); - - if (nodeRef == null) - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Invalid object ID"); - throw new InvalidArgumentException("Invalid object ID", basicFault); - } + NodeRef nodeRef = getNodeRefFromOID(parameters.getDocumentId()); if (!nodeService.exists(nodeRef)) { // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Invalid document OID"); - throw new ObjectNotFoundException("Invalid document OID", basicFault); + throw new ObjectNotFoundException("Invalid document OID", ExceptionUtils.createBasicFault(null, "Invalid document OID")); } - if (isFolderType(nodeRef)) + CMISMapping cmisMapping = cmisDictionaryService.getCMISMapping(); + + if (cmisMapping.isValidCmisDocument(cmisMapping.getCmisType(nodeService.getType(nodeRef))) == false) { // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Stream not supported for this type of node"); - throw new StreamNotSupportedException("Stream not supported for this type of node", basicFault); + throw new StreamNotSupportedException("Stream not supported for this type of node", ExceptionUtils.createBasicFault(null, "Stream not supported for this type of node")); } - ContentReader contentReader = null; + ContentReader reader = fileFolderService.getReader(nodeRef); - if (nodeService.getType(nodeRef).equals(ContentModel.TYPE_LINK)) - { - NodeRef destRef = (NodeRef) nodeService.getProperty(nodeRef, ContentModel.PROP_LINK_DESTINATION); - if (nodeService.exists(destRef)) - { - contentReader = fileFolderService.getReader(destRef); - } - else - { - throw new ObjectNotFoundException("Missing link destination"); - } - } - else - { - contentReader = fileFolderService.getReader(nodeRef); - } + GetContentStreamResponse response = new GetContentStreamResponse(); + response.setContentStream(new ContentStreamType()); + ContentStreamType contentStream = response.getContentStream(); + contentStream.setLength(BigInteger.valueOf(reader.getSize())); + contentStream.setMimeType(reader.getMimetype()); + String filename = (String) cmisPropertyService.getProperty(nodeRef, CMISMapping.PROP_NAME); + contentStream.setFilename(filename); + contentStream.setStream(new DataHandler(new ContentReaderDataSource(reader, filename))); - if (length.intValue() == -1) - { - length = new BigInteger(String.valueOf(contentReader.getSize())); - } - - byte[] buffer = new byte[length.intValue()]; - - try - { - InputStream inputStream = contentReader.getContentInputStream(); - inputStream.skip(offset.intValue()); - int resultLength = inputStream.read(buffer, 0, length.intValue()); - - if (resultLength == -1) - { - return new byte[0]; - } - - byte[] result = new byte[resultLength]; - for (int i = 0; i < resultLength; i++) - { - result[i] = buffer[i]; - } - return result; - } - catch (IndexOutOfBoundsException e) - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, e.getMessage()); - throw new OffsetException(e.getMessage(), basicFault, e); - } - catch (IOException e) - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, e.getMessage()); - throw new RuntimeException(e.getMessage(), basicFault, e); - } + return response; } - public java.lang.String createRelationship(java.lang.String typeId, org.alfresco.repo.cmis.ws.RelationshipObjectType propertyCollection, java.lang.String sourceObjectId, - java.lang.String targetObjectId) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, ObjectNotFoundException, - ConstraintViolationException, OperationNotSupportedException, PermissionDeniedException + public GetPropertiesResponse getProperties(GetProperties parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, FilterNotValidException, + OperationNotSupportedException, UpdateConflictException, PermissionDeniedException { - System.out.println(typeId); - System.out.println(propertyCollection); - System.out.println(sourceObjectId); - System.out.println(targetObjectId); - try - { - java.lang.String _return = ""; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new TypeNotFoundException("TypeNotFoundException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public org.alfresco.repo.cmis.ws.SetContentStreamResponse setContentStream(SetContentStream parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - AlreadyExistsException, ObjectNotFoundException, StorageException, ConstraintViolationException, OperationNotSupportedException, StreamNotSupportedException, - PermissionDeniedException - { - System.out.println(parameters); - try - { - org.alfresco.repo.cmis.ws.SetContentStreamResponse _return = null; - return _return; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new AlreadyExistsException("AlreadyExistsException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new StorageException("StorageException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new StreamNotSupportedException("StreamNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public void deleteObject(java.lang.String objectId) throws RuntimeException, ConcurrencyException, InvalidArgumentException, ObjectNotFoundException, - ConstraintViolationException, OperationNotSupportedException, PermissionDeniedException - { - System.out.println(objectId); - try - { - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new ObjectNotFoundException("ObjectNotFoundException..."); - // throw new ConstraintViolationException("ConstraintViolationException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public org.alfresco.repo.cmis.ws.GetPropertiesResponse getProperties(GetProperties parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, - ObjectNotFoundException, FilterNotValidException, OperationNotSupportedException, PermissionDeniedException - { - GetPropertiesResponse response = new GetPropertiesResponse(); - response.setObject(new DocumentFolderOrRelationshipObjectType()); - PropertyFilter propertyFilter = new PropertyFilter(parameters.getFilter()); - NodeRef nodeRef = OIDUtils.OIDtoNodeRef(parameters.getObjectId()); + NodeRef nodeRef = getNodeRefFromOID(parameters.getObjectId()); - if (nodeRef != null) + if (nodeService.exists(nodeRef) == false) { - if (nodeService.exists(nodeRef) == false) - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Object not found"); - throw new ObjectNotFoundException("Object not found", basicFault); - } + // TODO: error code + throw new ObjectNotFoundException("Object not found", ExceptionUtils.createBasicFault(null, "Object not found")); + } - if (isFolderType(nodeRef)) - { - setFolderObjectTypeProperties(nodeRef, response.getObject(), propertyFilter); - } - else - { - VersionEnum neededVersion = parameters.getReturnVersion(); + QName typeQName = nodeService.getType(nodeRef); - if (neededVersion != null) - { - if (neededVersion.equals(VersionEnum.LATEST)) - { - nodeRef = getLatestVersionNodeRef(nodeRef, false); - } - else if (neededVersion.equals(VersionEnum.LATEST_MAJOR)) - { - nodeRef = getLatestVersionNodeRef(nodeRef, true); - } - } + GetPropertiesResponse response = new GetPropertiesResponse(); + response.setObject(new ObjectType()); - setDocumentObjectTypeProperties(nodeRef, response.getObject(), propertyFilter); - } + if (cmisDictionaryService.getCMISMapping().isValidCmisFolder(typeQName)) + { + ObjectType folderObject = response.getObject(); + folderObject.setProperties(getPropertiesType(nodeRef, propertyFilter)); +// TODO: folderObject.setAllowableActions(getAllowableActionsType(nodeRef)); } else { - AssociationRef associationRef = OIDUtils.OIDtoAssocRef(parameters.getObjectId()); + VersionEnum neededVersion = parameters.getReturnVersion(); - if (associationRef != null) + if (neededVersion != null) { - if (exists(associationRef) == false) + if (neededVersion.equals(VersionEnum.LATEST)) { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Object not found"); - throw new ObjectNotFoundException("Object not found", basicFault); + nodeRef = getLatestVersionNodeRef(nodeRef, false); } + else if (neededVersion.equals(VersionEnum.LATEST_MAJOR)) + { + nodeRef = getLatestVersionNodeRef(nodeRef, true); + } + } - setRelationshipObjectTypeProperties(associationRef, response.getObject(), propertyFilter); - } - else - { - // TODO: error code - BasicFault basicFault = ExceptionUtils.createBasicFault(null, "Invalid object ID"); - throw new InvalidArgumentException("Invalid object ID", basicFault); - } + ObjectType documentObject = response.getObject(); + documentObject.setProperties(getPropertiesType(nodeRef, propertyFilter)); +// TODO: documentObject.setAllowableActions(getAllowableActionsType(nodeRef)); } return response; } + public void moveObject(String repositoryId, String objectId, String targetFolderId, String sourceFolderId) throws RuntimeException, InvalidArgumentException, + ObjectNotFoundException, NotInFolderException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, FolderNotValidException, + PermissionDeniedException + { + } + + public SetContentStreamResponse setContentStream(SetContentStream parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, StorageException, + ContentAlreadyExistsException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, StreamNotSupportedException, + PermissionDeniedException + { + return null; + } + + public void updateProperties(String repositoryId, Holder objectId, String changeToken, PropertiesType properties) throws RuntimeException, InvalidArgumentException, + ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException + { + } + } diff --git a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java index 0d9e17615c..5fc172fa1d 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePort.java @@ -24,180 +24,213 @@ */ package org.alfresco.repo.cmis.ws; +import java.math.BigInteger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; -import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.StoreRef; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.alfresco.cmis.dictionary.CMISCardinality; +import org.alfresco.cmis.dictionary.CMISPropertyDefinition; +import org.alfresco.cmis.dictionary.CMISPropertyType; +import org.alfresco.cmis.dictionary.CMISTypeDefinition; +import org.alfresco.cmis.dictionary.CMISTypeId; +import org.alfresco.cmis.dictionary.CMISUpdatability; +import org.alfresco.cmis.dictionary.ContentStreamAllowed; +import org.alfresco.cmis.search.FullTextSearchSupport; +import org.alfresco.cmis.search.JoinSupport; +import org.alfresco.service.descriptor.Descriptor; /** - * @author Michael Shavnev + * Port for repository service + * * @author Dmitry Lazurkin */ @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 final Log log = LogFactory.getLog("org.alfresco.repo.cmis.ws"); + private static Map fulltextEnumMapping; + private static Map joinEnumMapping; + private static Map contentStreamAllowedEnumMapping; + private static Map updatabilityEnumMapping; + private static Map cardinalityEnumMapping; + private static Map propertyTypeEnumMapping; - private String rootPath; - private NodeRef rootNodeRef; - - public GetRootFolderResponse getRootFolder(GetRootFolder parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, FilterNotValidException, - OperationNotSupportedException, PermissionDeniedException + static { - PropertyFilter propertyFilter = new PropertyFilter(parameters.getFilter()); - FolderObjectType folderObject = new FolderObjectType(); + fulltextEnumMapping = new HashMap(); + fulltextEnumMapping.put(FullTextSearchSupport.NO_FULL_TEXT, FulltextEnum.NO_FULLTEXT); + fulltextEnumMapping.put(FullTextSearchSupport.FULL_TEXT_ONLY, FulltextEnum.FULLTEXT_ONLY); + fulltextEnumMapping.put(FullTextSearchSupport.FULL_TEXT_AND_STRUCTURED, FulltextEnum.FULLTEXT_AND_STRUCTURED); - propertyFilter.disableProperty(CmisProperty.NAME); - propertyFilter.disableProperty(CmisProperty.PARENT); - setFolderObjectTypeProperties(getRootNodeRef(), folderObject, propertyFilter); - propertyFilter.enableProperty(CmisProperty.NAME); - propertyFilter.enableProperty(CmisProperty.PARENT); + joinEnumMapping = new HashMap(); + joinEnumMapping.put(JoinSupport.INNER_AND_OUTER_JOIN_SUPPORT, JoinEnum.INNER_AND_OUTER); + joinEnumMapping.put(JoinSupport.INNER_JOIN_SUPPORT, JoinEnum.INNER_ONLY); + joinEnumMapping.put(JoinSupport.NO_JOIN_SUPPORT, JoinEnum.NO_JOIN); - if (propertyFilter.allow(CmisProperty.NAME)) - { - folderObject.setName("CMIS_Root_Folder"); - } + contentStreamAllowedEnumMapping = new HashMap(); + contentStreamAllowedEnumMapping.put(ContentStreamAllowed.ALLOWED, ContentStreamAllowedEnum.ALLOWED); + contentStreamAllowedEnumMapping.put(ContentStreamAllowed.NOT_ALLOWED, ContentStreamAllowedEnum.NOT_ALLOWED); + contentStreamAllowedEnumMapping.put(ContentStreamAllowed.REQUIRED, ContentStreamAllowedEnum.REQUIRED); - if (propertyFilter.allow(CmisProperty.PARENT)) - { - folderObject.setParent(OIDUtils.toOID(rootNodeRef)); - } + updatabilityEnumMapping = new HashMap(); + updatabilityEnumMapping.put(CMISUpdatability.READ_AND_WRITE, UpdatabilityEnum.READ_WRITE); + updatabilityEnumMapping.put(CMISUpdatability.READ_AND_WRITE_WHEN_CHECKED_OUT, UpdatabilityEnum.READ_WRITE_WHEN_CHECKED_OUT); + updatabilityEnumMapping.put(CMISUpdatability.READ_ONLY, UpdatabilityEnum.READ_ONLY); - GetRootFolderResponse response = new GetRootFolderResponse(); - response.setRootFolder(folderObject); - return response; + cardinalityEnumMapping = new HashMap(); + cardinalityEnumMapping.put(CMISCardinality.MULTI_VALUED, CardinalityEnum.MULTI_VALUED); + cardinalityEnumMapping.put(CMISCardinality.SINGLE_VALUED, CardinalityEnum.SINGLE_VALUED); + + propertyTypeEnumMapping = new HashMap(); + propertyTypeEnumMapping.put(CMISPropertyType.Boolean, PropertyTypeEnum.BOOLEAN); + propertyTypeEnumMapping.put(CMISPropertyType.DateTime, PropertyTypeEnum.DATE_TIME); + propertyTypeEnumMapping.put(CMISPropertyType.Decimal, PropertyTypeEnum.DECIMAL); + propertyTypeEnumMapping.put(CMISPropertyType.HTML, PropertyTypeEnum.HTML); + propertyTypeEnumMapping.put(CMISPropertyType.ID, PropertyTypeEnum.ID); + propertyTypeEnumMapping.put(CMISPropertyType.Integer, PropertyTypeEnum.INTEGER); + propertyTypeEnumMapping.put(CMISPropertyType.String, PropertyTypeEnum.STRING); + propertyTypeEnumMapping.put(CMISPropertyType.URI, PropertyTypeEnum.URI); + propertyTypeEnumMapping.put(CMISPropertyType.XML, PropertyTypeEnum.XML); } - private NodeRef getRootNodeRef() + public List getRepositories() throws RuntimeException, InvalidArgumentException, OperationNotSupportedException, UpdateConflictException, + PermissionDeniedException { - if (rootNodeRef == null) - { - int indexOfStoreDelim = rootPath.indexOf(StoreRef.URI_FILLER); - - if (indexOfStoreDelim == -1) - { - throw new java.lang.RuntimeException("Bad path format, " + StoreRef.URI_FILLER + " not found"); - } - - indexOfStoreDelim += StoreRef.URI_FILLER.length(); - - int indexOfPathDelim = rootPath.indexOf("/", indexOfStoreDelim); - - if (indexOfPathDelim == -1) - { - throw new java.lang.RuntimeException("Bad path format, / not found"); - } - - String storePath = rootPath.substring(0, indexOfPathDelim); - String rootPathInStore = rootPath.substring(indexOfPathDelim); - - StoreRef storeRef = new StoreRef(storePath); - if (nodeService.exists(storeRef) == false) - { - throw new java.lang.RuntimeException("No store for path: " + storeRef); - } - - NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef); - - if (rootPath.equals("/")) - { - rootNodeRef = storeRootNodeRef; - } - else - { - List nodeRefs = searchService.selectNodes(storeRootNodeRef, rootPathInStore, null, namespaceService, false); - - if (nodeRefs.size() > 1) - { - throw new java.lang.RuntimeException("Multiple possible roots for : \n" + " root path: " + rootPath + "\n" + " results: " + nodeRefs); - } - else if (nodeRefs.size() == 0) - { - throw new java.lang.RuntimeException("No root found for : \n" + " root path: " + rootPath); - } - else - { - rootNodeRef = nodeRefs.get(0); - } - } - } - - return rootNodeRef; + RepositoryType repositoryType = new RepositoryType(); + Descriptor serverDescriptor = descriptorService.getCurrentRepositoryDescriptor(); + repositoryType.setRepositoryID(serverDescriptor.getId()); + System.out.println("**** ID: " + serverDescriptor.getId()); + repositoryType.setRepositoryName(serverDescriptor.getName()); + return Collections.singletonList(repositoryType); } - public GetTypesResponse getTypes(GetTypes parameters) throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, - PermissionDeniedException + public RepositoryInfoType getRepositoryInfo(String repositoryId) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, + OperationNotSupportedException, UpdateConflictException, PermissionDeniedException { - System.out.println(parameters); - try + Descriptor serverDescriptor = descriptorService.getCurrentRepositoryDescriptor(); + + if (serverDescriptor.getId().equals(repositoryId) == false) { - org.alfresco.repo.cmis.ws.GetTypesResponse _return = null; - return _return; + // TODO: error code + throw new InvalidArgumentException("Invalid repository id", ExceptionUtils.createBasicFault(null, "Invalid repository id")); } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); + + RepositoryInfoType repositoryInfoType = new RepositoryInfoType(); + repositoryInfoType.setRepositoryId(serverDescriptor.getId()); + repositoryInfoType.setRepositoryName(serverDescriptor.getName()); + repositoryInfoType.setRepositoryDescription(""); + repositoryInfoType.setRootFolderId(cmisService.getDefaultRootNodeRef().toString()); + repositoryInfoType.setVendorName("Alfresco"); + repositoryInfoType.setProductName("Alfresco Repository (" + serverDescriptor.getEdition() + ")"); + repositoryInfoType.setProductVersion(serverDescriptor.getVersion()); + CapabilitiesType capabilities = new CapabilitiesType(); + capabilities.setCapabilityMultifiling(true); + capabilities.setCapabilityUnfiling(false); + capabilities.setCapabilityVersionSpecificFiling(false); + capabilities.setCapabilityPWCUpdatable(true); + capabilities.setCapabilityAllVersionsSearchable(cmisQueryService.getAllVersionsSearchable()); + capabilities.setCapabilityJoin(joinEnumMapping.get(cmisQueryService.getJoinSupport())); + capabilities.setCapabilityFulltext(fulltextEnumMapping.get(cmisQueryService.getFullTextSearchSupport())); + repositoryInfoType.setCapabilities(capabilities); + repositoryInfoType.setCmisVersionsSupported(cmisService.getCMISVersion()); + + return repositoryInfoType; } - public void getTypeDefinition(java.lang.String typeId, java.lang.Boolean includeInheritedProperties, javax.xml.ws.Holder type, - javax.xml.ws.Holder canCreateInstances) throws RuntimeException, ConcurrencyException, InvalidArgumentException, TypeNotFoundException, - OperationNotSupportedException, PermissionDeniedException - { - System.out.println(typeId); - System.out.println(includeInheritedProperties); - try - { - org.alfresco.repo.cmis.ws.ObjectTypeDefinitionType typeValue = null; - type.value = typeValue; - java.lang.Boolean canCreateInstancesValue = null; - canCreateInstances.value = canCreateInstancesValue; - } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new TypeNotFoundException("TypeNotFoundException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); - } - - public RepositoryInfoType getRepositoryInfo() throws RuntimeException, ConcurrencyException, InvalidArgumentException, OperationNotSupportedException, - PermissionDeniedException + /** + * @param allowedTypes collection of CMISTypeId + * @param allowedTypesResult output list of strings + */ + private void setAllowedTypes(Collection allowedTypes, List allowedTypesResult) { - try + for(CMISTypeId typeId : allowedTypes) { - org.alfresco.repo.cmis.ws.RepositoryInfoType _return = null; - return _return; + allowedTypesResult.add(typeId.getTypeId()); } - catch (Exception ex) - { - ex.printStackTrace(); - throw new java.lang.RuntimeException(ex); - } - // throw new RuntimeException("RuntimeException..."); - // throw new ConcurrencyException("ConcurrencyException..."); - // throw new InvalidArgumentException("InvalidArgumentException..."); - // throw new OperationNotSupportedException("OperationNotSupportedException..."); - // throw new PermissionDeniedException("PermissionDeniedException..."); } - public void setRootPath(String rootPath) + /** + * @param propertyDefinition + * @param propertyDefs + */ + private void addPropertyDef(CMISPropertyDefinition propertyDefinition, List propertyDefs) { - this.rootPath = rootPath; + PropertyAttributesType propertyAttributes = new PropertyAttributesType(); + + propertyAttributes.setPropertyName(propertyDefinition.getPropertyName()); + propertyAttributes.setPropertyId(propertyDefinition.getPropertyId()); + propertyAttributes.setDisplayName(propertyDefinition.getDisplayName()); + propertyAttributes.setDescription(propertyDefinition.getDescription()); + propertyAttributes.setIsInherited(propertyDefinition.isInherited()); + propertyAttributes.setPropertyType(propertyTypeEnumMapping.get(propertyDefinition.getPropertyType())); + propertyAttributes.setCardinality(cardinalityEnumMapping.get(propertyDefinition.getCardinality())); + propertyAttributes.setMaximumLength(BigInteger.valueOf(propertyDefinition.getMaximumLength())); + propertyAttributes.setSchemaURI(propertyDefinition.getSchemaURI()); + propertyAttributes.setEncoding(propertyDefinition.getEncoding()); + // TODO: add choices +// List choices = propertyAttributes.getChoice(); +// for(CMISChoice cmisChoice : propertyDefinition.getChoices()) +// { +// ChoiceType choice = new ChoiceType(); +// choice.setIndex(BigInteger.valueOf(cmisChoice.getIndex())); +// choice.setKey(cmisChoice.getName()); +// choices.add(choice); +// } + propertyAttributes.setOpenChoice(propertyDefinition.isOpenChoice()); + propertyAttributes.setRequired(propertyDefinition.isRequired()); + propertyAttributes.setDefaultValue(propertyDefinition.getDefaultValue()); + propertyAttributes.setUpdatability(updatabilityEnumMapping.get(propertyDefinition.getUpdatability())); + propertyAttributes.setQueryable(propertyDefinition.isQueryable()); + propertyAttributes.setOrderable(propertyDefinition.isOrderable()); + + propertyDefs.add(propertyAttributes); + } + + public ObjectTypeDefinitionType getTypeDefinition(String repositoryId, String typeId) throws RuntimeException, InvalidArgumentException, TypeNotFoundException, + ObjectNotFoundException, ConstraintViolationException, OperationNotSupportedException, UpdateConflictException, PermissionDeniedException + { + CMISTypeId cmisTypeId = cmisDictionaryService.getCMISMapping().getCmisTypeId(typeId); + CMISTypeDefinition typeDefinition = cmisDictionaryService.getType(cmisTypeId); + + if (typeDefinition == null) + { + // TODO: error code + throw new ObjectNotFoundException("Type not found", ExceptionUtils.createBasicFault(null, "Type not found")); + } + + ObjectTypeDefinitionType objectTypeDefinitionType = new ObjectTypeDefinitionType(); + objectTypeDefinitionType.setObjectTypeID(typeDefinition.getObjectTypeId().getTypeId()); + objectTypeDefinitionType.setObjectTypeQueryName(typeDefinition.getObjectTypeQueryName()); + objectTypeDefinitionType.setObjectTypeDisplayName(typeDefinition.getObjectTypeDisplayName()); + objectTypeDefinitionType.setParentTypeID(typeDefinition.getParentTypeId().getTypeId()); + objectTypeDefinitionType.setRootTypeQueryName(typeDefinition.getRootTypeQueryName()); + objectTypeDefinitionType.setDescription(typeDefinition.getDescription()); + objectTypeDefinitionType.setCreatable(typeDefinition.isCreatable()); + objectTypeDefinitionType.setFileable(typeDefinition.isFileable()); + objectTypeDefinitionType.setQueryable(typeDefinition.isQueryable()); + objectTypeDefinitionType.setControllable(typeDefinition.isControllable()); + objectTypeDefinitionType.setVersionable(typeDefinition.isVersionable()); + objectTypeDefinitionType.setContentStreamAllowed(contentStreamAllowedEnumMapping.get(typeDefinition.getContentStreamAllowed())); + setAllowedTypes(typeDefinition.getAllowedSourceTypes(), objectTypeDefinitionType.getAllowedSourceType()); + setAllowedTypes(typeDefinition.getAllowedTargetTypes(), objectTypeDefinitionType.getAllowedTargetType()); + + List propertyDefs = objectTypeDefinitionType.getProperty(); + + for (CMISPropertyDefinition propDef : cmisDictionaryService.getPropertyDefinitions(typeDefinition.getObjectTypeId()).values()) + { + addPropertyDef(propDef, propertyDefs); + } + + return objectTypeDefinitionType; + } + + public GetTypesResponse getTypes(GetTypes parameters) throws RuntimeException, InvalidArgumentException, ObjectNotFoundException, ConstraintViolationException, + OperationNotSupportedException, UpdateConflictException, PermissionDeniedException + { + return null; } } diff --git a/source/java/org/alfresco/repo/cmis/ws/DMServicePortThrowsAdvice.java b/source/java/org/alfresco/repo/cmis/ws/DMServicePortThrowsAdvice.java index 7ef9725758..696a041534 100644 --- a/source/java/org/alfresco/repo/cmis/ws/DMServicePortThrowsAdvice.java +++ b/source/java/org/alfresco/repo/cmis/ws/DMServicePortThrowsAdvice.java @@ -24,6 +24,9 @@ */ package org.alfresco.repo.cmis.ws; +import org.alfresco.repo.cmis.ws.BasicFault; +import org.alfresco.repo.cmis.ws.PermissionDeniedException; +import org.alfresco.repo.cmis.ws.RuntimeException; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +38,7 @@ import org.springframework.aop.ThrowsAdvice; */ public class DMServicePortThrowsAdvice implements ThrowsAdvice { - private static final Log log = LogFactory.getLog("org.alfresco.cmis.ws"); + private static final Log log = LogFactory.getLog("org.alfresco.repo.cmis.ws"); public void afterThrowing(AccessDeniedException e) throws PermissionDeniedException { diff --git a/source/java/org/alfresco/repo/cmis/ws/ExceptionUtils.java b/source/java/org/alfresco/repo/cmis/ws/ExceptionUtils.java index 654ecb4db9..947b3fd356 100644 --- a/source/java/org/alfresco/repo/cmis/ws/ExceptionUtils.java +++ b/source/java/org/alfresco/repo/cmis/ws/ExceptionUtils.java @@ -26,6 +26,8 @@ package org.alfresco.repo.cmis.ws; import java.math.BigInteger; +import org.alfresco.repo.cmis.ws.BasicFault; + /** * Utils for working with cmis exceptions * diff --git a/source/java/org/alfresco/repo/cmis/ws/OIDUtils.java b/source/java/org/alfresco/repo/cmis/ws/OIDUtils.java deleted file mode 100644 index b3d397ab7d..0000000000 --- a/source/java/org/alfresco/repo/cmis/ws/OIDUtils.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2005-2008 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.repo.cmis.ws; - -import org.alfresco.service.cmr.repository.AssociationRef; -import org.alfresco.service.cmr.repository.NodeRef; - -/** - * @author Dmitry Lazurkin - * - */ -public class OIDUtils -{ - - /** - * Returns OID for node reference - * - * @param nodeRef node reference - * @return OID - */ - public static String toOID(NodeRef nodeRef) - { - return OIDType.DOCUMENT_FOLDER.ordinal() + nodeRef.toString(); - } - - /** - * Returns OID for association reference - * - * @param assocRef association reference - * @return OID - */ - public static String toOID(AssociationRef assocRef) - { - return OIDType.RELATIONSHIP.ordinal() + assocRef.toString(); - } - - /** - * Returns node reference for OID - * - * @param oid OID - * @return node reference - */ - public static NodeRef OIDtoNodeRef(String oid) - { - NodeRef nodeRef = null; - - OIDType oidType = OIDType.getOIDType(oid); - if (oidType != null && oidType.equals(OIDType.DOCUMENT_FOLDER)) - { - try - { - nodeRef = new NodeRef(oid.substring(1)); - } - catch (Exception e) - { - // expected if OID string is bad - } - } - - return nodeRef; - } - - /** - * Returns association reference for OID - * - * @param oid OID - * @return association reference - */ - public static AssociationRef OIDtoAssocRef(String oid) - { - AssociationRef assocRef = null; - - OIDType oidType = OIDType.getOIDType(oid); - if (oidType != null && oidType.equals(OIDType.RELATIONSHIP)) - { - try - { - assocRef = new AssociationRef(oid.substring(1)); - } - catch (Exception e) - { - // expected if oid string is bad - } - } - - return assocRef; - } - -} diff --git a/source/java/org/alfresco/repo/cmis/ws/PropertyFilter.java b/source/java/org/alfresco/repo/cmis/ws/PropertyFilter.java index f389b4a6e2..929ffa9a86 100644 --- a/source/java/org/alfresco/repo/cmis/ws/PropertyFilter.java +++ b/source/java/org/alfresco/repo/cmis/ws/PropertyFilter.java @@ -25,7 +25,6 @@ package org.alfresco.repo.cmis.ws; import java.util.Arrays; -import java.util.EnumSet; import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; @@ -41,7 +40,6 @@ public class PropertyFilter private static final Pattern PROPERTY_FILTER_REGEX = Pattern.compile("^(\\*)|([\\p{Upper}\\p{Digit}_]+(,[\\p{Upper}\\p{Digit}_]+)*)$"); private Set properties; - private EnumSet disabledProperties = EnumSet.noneOf(CmisProperty.class); /** * Constructor @@ -69,29 +67,9 @@ public class PropertyFilter * @param property property * @return if property is allow by filter then returns true else false */ - public boolean allow(CmisProperty property) + public boolean allow(String property) { - return disabledProperties.contains(property) == false && (properties == null || properties.contains(property.name())); + return properties == null || properties.contains(property); } - /** - * Disables property - * - * @param property property - */ - public void disableProperty(CmisProperty property) - { - disabledProperties.add(property); - } - - /** - * Enables property - * - * @param property property - */ - public void enableProperty(CmisProperty property) - { - disabledProperties.remove(property); - } - -} +} \ No newline at end of file diff --git a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java index de517ee754..2aeb9e49a1 100644 --- a/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java +++ b/source/java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java @@ -138,12 +138,8 @@ public abstract class BaseWebScriptTest extends TestCase protected Response sendRequest(Request req, int expectedStatus, String asUser) throws IOException { - if (logger.isDebugEnabled()) - { - logger.debug("Request"); - logger.debug(req.getMethod() + " " + req.getFullUri()); - logger.debug(req.getBody() == null ? null : new String(req.getBody())); - } + if (logger.isInfoEnabled()) + logger.info("Request: " + req.getMethod() + " " + req.getFullUri() + (req.getBody() == null ? "" : "\n" + new String(req.getBody()))); Response res = null; if (remoteServer == null) @@ -155,11 +151,8 @@ public abstract class BaseWebScriptTest extends TestCase res = sendRemoteRequest(req, expectedStatus); } - if (logger.isDebugEnabled()) - { - logger.debug("Response:"); - logger.debug(res.getContentAsString()); - } + if (logger.isInfoEnabled()) + logger.info("Response: " + res.getStatus() + " " + req.getMethod() + " " + req.getFullUri() + "\n" + res.getContentAsString()); if (expectedStatus > 0 && expectedStatus != res.getStatus()) { @@ -167,7 +160,7 @@ public abstract class BaseWebScriptTest extends TestCase // { // System.out.println(res.getContentAsString()); // } - fail("Status code " + res.getStatus() + " returned, but expected " + expectedStatus + " for " + req.getFullUri() + " (" + req.getMethod() + ")"); + fail("Status code " + res.getStatus() + " returned, but expected " + expectedStatus + " for " + req.getFullUri() + " (" + req.getMethod() + ")\n" + res.getContentAsString()); } return res; diff --git a/source/java/org/alfresco/repo/web/util/paging/ArrayPagedResults.java b/source/java/org/alfresco/repo/web/util/paging/ArrayPagedResults.java deleted file mode 100644 index 094d67879c..0000000000 --- a/source/java/org/alfresco/repo/web/util/paging/ArrayPagedResults.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2005-2007 Alfresco Software Limited. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have recieved a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.repo.web.util.paging; - -import java.io.Serializable; - - -/** - * Implementation of Paged Results based on an array result set. - * - * @author davidc - */ -public class ArrayPagedResults implements PagedResults, Serializable -{ - private static final long serialVersionUID = 5905699888354619269L; - - private Object[] results; - private Cursor cursor; - - - /** - * Construct - * - * @param results results for the page within cursor - * @param cursor the cursor - */ - /*Package*/ ArrayPagedResults(Object[] results, Cursor cursor) - { - this.results = results; - this.cursor = cursor; - } - - /* (non-Javadoc) - * @see org.alfresco.repo.web.util.paging.PagedResults#getResults() - */ - public Object[] getResults() - { - return results; - } - - /* (non-Javadoc) - * @see org.alfresco.repo.web.util.paging.PagedResults#getCursor() - */ - public Cursor getCursor() - { - return cursor; - } - -} diff --git a/source/java/org/alfresco/repo/web/util/paging/PagedResults.java b/source/java/org/alfresco/repo/web/util/paging/PagedResults.java index b3fb7e6f93..4f6422c199 100644 --- a/source/java/org/alfresco/repo/web/util/paging/PagedResults.java +++ b/source/java/org/alfresco/repo/web/util/paging/PagedResults.java @@ -24,24 +24,84 @@ */ package org.alfresco.repo.web.util.paging; +import java.io.Serializable; + /** * A Paged Result Set * * @author davidc */ -public interface PagedResults +public class PagedResults implements Serializable { - /** - * An array of the results for the given page within the cursor - * @return the paged results - */ - Object[] getResults(); + private static final long serialVersionUID = 5905699888354619269L; + private Object result; + private Object[] results; + private Cursor cursor; + + /** - * Gets the cursor + * Construct + * + * @param results results for the page within cursor + * @param cursor the cursor + */ + /*Package*/ PagedResults(Object[] results, Cursor cursor) + { + this.result = results; + this.results = results; + this.cursor = cursor; + } + + /** + * Construct + * + * @param results results for the page within cursor + * @param cursor the cursor + */ + /*Package*/ PagedResults(Object result, Cursor cursor) + { + this.result = result; + this.results = null; + this.cursor = cursor; + } + + /** + * Get Results + * + * @return results + */ + public Object[] getResults() + { + if (results == null) + { + if (result != null) + { + results = new Object[] {result}; + } + } + return results; + } + + /** + * Get Result + * + * @return result + */ + public Object getResult() + { + return result; + } + + /** + * Get Cursor * * @return cursor */ - Cursor getCursor(); + public Cursor getCursor() + { + return cursor; + } + } diff --git a/source/java/org/alfresco/repo/web/util/paging/Paging.java b/source/java/org/alfresco/repo/web/util/paging/Paging.java index fa29066ba9..fcdc0994d1 100644 --- a/source/java/org/alfresco/repo/web/util/paging/Paging.java +++ b/source/java/org/alfresco/repo/web/util/paging/Paging.java @@ -234,11 +234,11 @@ public class Paging { if (pageNumber != null || pageSize != null) { - return createPage(pageNumber == null ? isZeroBasedPage() ? 0 : 1 : pageNumber, pageSize == null ? 0 : pageSize); + return createPage(pageNumber == null ? isZeroBasedPage() ? 0 : 1 : pageNumber, pageSize == null ? -1 : pageSize); } else if (skipCount != null || maxItems != null) { - return createWindow(skipCount == null ? isZeroBasedRow() ? 0 : 1 : skipCount, maxItems == null ? 0 : maxItems); + return createWindow(skipCount == null ? isZeroBasedRow() ? 0 : 1 : skipCount, maxItems == null ? -1 : maxItems); } return createUnlimitedPage(); } @@ -305,7 +305,19 @@ public class Paging */ public PagedResults createPagedResults(Object[] results, Cursor cursor) { - return new ArrayPagedResults(results, cursor); + return new PagedResults(results, cursor); } - + + /** + * Create a Paged Result Set + * + * @param results the results for the page within the cursor + * @param cursor the cursor + * @return the paged result set + */ + public PagedResults createPagedResult(Object result, Cursor cursor) + { + return new PagedResults(result, cursor); + } + } diff --git a/source/java/org/alfresco/repo/web/util/paging/PagingTest.java b/source/java/org/alfresco/repo/web/util/paging/PagingTest.java index 6efefb492b..aec185481f 100644 --- a/source/java/org/alfresco/repo/web/util/paging/PagingTest.java +++ b/source/java/org/alfresco/repo/web/util/paging/PagingTest.java @@ -238,7 +238,7 @@ public class PagingTest extends TestCase public void testUnlimitedPage() { - Cursor cursor1 = paging.createCursor(100, paging.createPage(1, 0)); + Cursor cursor1 = paging.createCursor(100, paging.createPage(1, -1)); assertTrue(cursor1.isInRange()); assertEquals(1, cursor1.getCurrentPage()); assertEquals(1, cursor1.getFirstPage()); @@ -247,7 +247,7 @@ public class PagingTest extends TestCase assertEquals(-1, cursor1.getNextPage()); assertEquals(0, cursor1.getStartRow()); assertEquals(99, cursor1.getEndRow()); - Cursor cursor2 = paging.createCursor(100, paging.createPage(2, 0)); + Cursor cursor2 = paging.createCursor(100, paging.createPage(2, -1)); assertFalse(cursor2.isInRange()); } @@ -337,7 +337,7 @@ public class PagingTest extends TestCase public void testUnlimitedWindow() { - Cursor cursor1 = paging.createCursor(100, paging.createWindow(0, 0)); + Cursor cursor1 = paging.createCursor(100, paging.createWindow(0, -1)); assertTrue(cursor1.isInRange()); assertEquals(0, cursor1.getStartRow()); assertEquals(99, cursor1.getEndRow()); diff --git a/source/java/org/apache/abdera/ext/cmis/CMISCapabilities.java b/source/java/org/apache/abdera/ext/cmis/CMISCapabilities.java new file mode 100644 index 0000000000..83c58a4639 --- /dev/null +++ b/source/java/org/apache/abdera/ext/cmis/CMISCapabilities.java @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.apache.abdera.ext.cmis; + +import org.apache.abdera.factory.Factory; +import org.apache.abdera.model.Element; +import org.apache.abdera.model.ElementWrapper; + + +/** + * CMIS Repository Info for the Abdera ATOM library. + * + * Encapsulates access and modification of CMIS extension values to ATOM + * Service Document. + * + * NOTE: Potentially, this extension can be contributed to Abdera upon + * publication of CMIS. This is why it is organised under a + * non-Alfresco Java package. It follows the conventions of all + * other Abdera extensions. + * + * @author davidc + */ +public class CMISCapabilities extends ElementWrapper +{ + public CMISCapabilities(Element internal) + { + super(internal); + } + + public CMISCapabilities(Factory factory) + { + super(factory, CMISConstants.REPOSITORY_INFO); + } + + public boolean hasMultifiling() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_MULTIFILING); + return Boolean.valueOf(child.getText()); + } + + public boolean hasUnfiling() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_UNFILING); + return Boolean.valueOf(child.getText()); + } + + public boolean hasVersionSpecificFiling() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_VERSION_SPECIFIC_FILING); + return Boolean.valueOf(child.getText()); + } + + public boolean isPWCUpdatable() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_PWC_UPDATEABLE); + return Boolean.valueOf(child.getText()); + } + + public boolean isAllVersionsSearchable() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_ALL_VERIONS_SEARCHABLE); + return Boolean.valueOf(child.getText()); + } + + public String getJoin() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_JOIN); + return child.getText(); + } + + public String getFullText() + { + Element child = getFirstChild(CMISConstants.CAPABILITY_FULLTEXT); + return child.getText(); + } + +} diff --git a/source/java/org/apache/abdera/ext/cmis/CMISConstants.java b/source/java/org/apache/abdera/ext/cmis/CMISConstants.java index 4d8b94d91b..49d1fceefa 100644 --- a/source/java/org/apache/abdera/ext/cmis/CMISConstants.java +++ b/source/java/org/apache/abdera/ext/cmis/CMISConstants.java @@ -43,16 +43,39 @@ public interface CMISConstants { public static final String CMIS_200805_NS = "http://www.cmis.org/2008/05"; + // CMIS Repository Info + public static final QName REPOSITORY_INFO = new QName(CMIS_200805_NS, "repositoryInfo"); + public static final QName REPOSITORY_ID = new QName(CMIS_200805_NS, "repositoryId"); + public static final QName REPOSITORY_NAME = new QName(CMIS_200805_NS, "repositoryName"); + public static final QName REPOSITORY_DESCRIPTION = new QName(CMIS_200805_NS, "repositoryDescription"); + public static final QName REPOSITORY_SPECIFIC_INFO = new QName(CMIS_200805_NS, "repositorySpecificInformation"); + public static final QName VENDOR_NAME = new QName(CMIS_200805_NS, "vendorName"); + public static final QName PRODUCT_NAME = new QName(CMIS_200805_NS, "productName"); + public static final QName PRODUCT_VERSION = new QName(CMIS_200805_NS, "productVersion"); + public static final QName VERSIONS_SUPPORTED = new QName(CMIS_200805_NS, "cmisVersionsSupported"); + + // CMIS Capabilities + public static final QName CAPABILITIES = new QName(CMIS_200805_NS, "capabilities"); + public static final QName CAPABILITY_MULTIFILING = new QName(CMIS_200805_NS, "capabilityMultifiling"); + public static final QName CAPABILITY_UNFILING = new QName(CMIS_200805_NS, "capabilityUnfiling"); + public static final QName CAPABILITY_VERSION_SPECIFIC_FILING = new QName(CMIS_200805_NS, "capabilityVersionSpecificFiling"); + public static final QName CAPABILITY_PWC_UPDATEABLE = new QName(CMIS_200805_NS, "capabilityPWCUpdateable"); + public static final QName CAPABILITY_ALL_VERIONS_SEARCHABLE = new QName(CMIS_200805_NS, "capabilityAllVersionsSearchable"); + public static final QName CAPABILITY_JOIN = new QName(CMIS_200805_NS, "capabilityJoin"); + public static final QName CAPABILITY_FULLTEXT = new QName(CMIS_200805_NS, "capabilityFullText"); + // CMIS Schema - public static final QName PROPERTIES = new QName(CMIS_200805_NS, "properties"); + public static final QName PROPERTIES = new QName(CMIS_200805_NS, "properties"); public static final QName PROPERTY_STRING = new QName(CMIS_200805_NS, "propertyString"); public static final QName PROPERTY_ID = new QName(CMIS_200805_NS, "propertyID"); public static final QName PROPERTY_BOOLEAN = new QName(CMIS_200805_NS, "propertyBoolean"); public static final QName PROPERTY_NAME = new QName(CMIS_200805_NS, "name"); // CMIS Properties + public static final String PROP_NAME = "name"; public static final String PROP_OBJECT_ID = "objectId"; public static final String PROP_BASETYPE = "baseType"; + public static final String PROP_OBJECT_TYPE = "objectType"; public static final String PROP_IS_IMMUTABLE = "isImmutable"; public static final String PROP_IS_LATEST_VERSION = "isLatestVersion"; public static final String PROP_IS_MAJOR_VERSION = "isMajorVersion"; diff --git a/source/java/org/apache/abdera/ext/cmis/CMISExtensionFactory.java b/source/java/org/apache/abdera/ext/cmis/CMISExtensionFactory.java index f767295414..554438e7d3 100644 --- a/source/java/org/apache/abdera/ext/cmis/CMISExtensionFactory.java +++ b/source/java/org/apache/abdera/ext/cmis/CMISExtensionFactory.java @@ -46,6 +46,8 @@ public class CMISExtensionFactory extends AbstractExtensionFactory public CMISExtensionFactory() { super(CMIS_200805_NS); + addImpl(REPOSITORY_INFO, CMISRepositoryInfo.class); + addImpl(CAPABILITIES, CMISCapabilities.class); addImpl(PROPERTIES, CMISProperties.class); } diff --git a/source/java/org/apache/abdera/ext/cmis/CMISProperties.java b/source/java/org/apache/abdera/ext/cmis/CMISProperties.java index 99c1b0d7d8..1eae6885b2 100644 --- a/source/java/org/apache/abdera/ext/cmis/CMISProperties.java +++ b/source/java/org/apache/abdera/ext/cmis/CMISProperties.java @@ -53,6 +53,11 @@ public class CMISProperties extends ElementWrapper super(factory, CMISConstants.PROPERTIES); } + public String getName() + { + return findPropertyString(CMISConstants.PROP_NAME); + } + public String getObjectId() { return findPropertyID(CMISConstants.PROP_OBJECT_ID); @@ -62,7 +67,12 @@ public class CMISProperties extends ElementWrapper { return findPropertyString(CMISConstants.PROP_BASETYPE); } - + + public String getObjectType() + { + return findPropertyString(CMISConstants.PROP_OBJECT_TYPE); + } + public boolean isImmutable() { return findPropertyBoolean(CMISConstants.PROP_IS_IMMUTABLE); @@ -114,7 +124,7 @@ public class CMISProperties extends ElementWrapper } - private String findPropertyString(String name) + public String findPropertyString(String name) { Element child = getFirstChild(CMISConstants.PROPERTY_STRING); while(child != null) @@ -128,7 +138,7 @@ public class CMISProperties extends ElementWrapper return null; } - private String findPropertyID(String name) + public String findPropertyID(String name) { Element child = getFirstChild(CMISConstants.PROPERTY_ID); while(child != null) @@ -142,7 +152,7 @@ public class CMISProperties extends ElementWrapper return null; } - private boolean findPropertyBoolean(String name) + public boolean findPropertyBoolean(String name) { Element child = getFirstChild(CMISConstants.PROPERTY_BOOLEAN); while(child != null) diff --git a/source/java/org/apache/abdera/ext/cmis/CMISRepositoryInfo.java b/source/java/org/apache/abdera/ext/cmis/CMISRepositoryInfo.java new file mode 100644 index 0000000000..31ab8c9130 --- /dev/null +++ b/source/java/org/apache/abdera/ext/cmis/CMISRepositoryInfo.java @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.apache.abdera.ext.cmis; + +import org.apache.abdera.factory.Factory; +import org.apache.abdera.model.Element; +import org.apache.abdera.model.ElementWrapper; + + +/** + * CMIS Repository Info for the Abdera ATOM library. + * + * Encapsulates access and modification of CMIS extension values to ATOM + * Service Document. + * + * NOTE: Potentially, this extension can be contributed to Abdera upon + * publication of CMIS. This is why it is organised under a + * non-Alfresco Java package. It follows the conventions of all + * other Abdera extensions. + * + * @author davidc + */ +public class CMISRepositoryInfo extends ElementWrapper +{ + public CMISRepositoryInfo(Element internal) + { + super(internal); + } + + public CMISRepositoryInfo(Factory factory) + { + super(factory, CMISConstants.REPOSITORY_INFO); + } + + + public String getId() + { + Element child = getFirstChild(CMISConstants.REPOSITORY_ID); + if (child != null) + { + return child.getText(); + } + return null; + } + + public String getName() + { + Element child = getFirstChild(CMISConstants.REPOSITORY_NAME); + if (child != null) + { + return child.getText(); + } + return null; + } + + public String getDescription() + { + Element child = getFirstChild(CMISConstants.REPOSITORY_DESCRIPTION); + if (child != null) + { + return child.getText(); + } + return null; + } + + public Element getSpecificInfo() + { + return getFirstChild(CMISConstants.REPOSITORY_SPECIFIC_INFO); + } + + public String getVendorName() + { + Element child = getFirstChild(CMISConstants.VENDOR_NAME); + if (child != null) + { + return child.getText(); + } + return null; + } + + public String getProdutName() + { + Element child = getFirstChild(CMISConstants.PRODUCT_NAME); + if (child != null) + { + return child.getText(); + } + return null; + } + + public String getProdutVersion() + { + Element child = getFirstChild(CMISConstants.PRODUCT_VERSION); + if (child != null) + { + return child.getText(); + } + return null; + } + + public String getVersionsSupported() + { + Element child = getFirstChild(CMISConstants.VERSIONS_SUPPORTED); + if (child != null) + { + return child.getText(); + } + return null; + } + + public CMISCapabilities getCapabilities() + { + Element child = getFirstChild(CMISConstants.CAPABILITIES); + if (child != null) + { + return (CMISCapabilities)child; + } + return null; + } +} diff --git a/source/test-resources/cmis/rest/query.cmissqlquery.xml b/source/test-resources/cmis/rest/query.cmissqlquery.xml new file mode 100644 index 0000000000..e4c46c2a42 --- /dev/null +++ b/source/test-resources/cmis/rest/query.cmissqlquery.xml @@ -0,0 +1,4 @@ + + + ${PAGESIZE} + diff --git a/source/test-resources/test-cmis-context.xml b/source/test-resources/test-cmis-context.xml index 2aeb1bddfc..7b718ad7dc 100644 --- a/source/test-resources/test-cmis-context.xml +++ b/source/test-resources/test-cmis-context.xml @@ -2,6 +2,7 @@ + @@ -65,26 +66,21 @@ - - - workspace://CmisTestWorkspace/alf:root_folder - - + - - - - - - - - - + + + + + + + + diff --git a/source/test/JavaCmisTest.zip b/source/test/JavaCmisTest.zip index c604b8f905..3a2d1379b8 100644 Binary files a/source/test/JavaCmisTest.zip and b/source/test/JavaCmisTest.zip differ diff --git a/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java index f73bdc97d2..25805576dc 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/AbstractServiceTest.java @@ -1,5 +1,28 @@ -package org.alfresco.repo.cmis.ws; +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.ws; import java.io.IOException; import java.util.HashMap; @@ -63,14 +86,12 @@ public abstract class AbstractServiceTest extends TestCase public AbstractServiceTest() { - servicePort = getServicePort(); Map wss4jOutInterceptorProp = new HashMap(); wss4jOutInterceptorProp.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP); wss4jOutInterceptorProp.put(WSHandlerConstants.USER, getUserName()); - // outProps.setProperty(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT); wss4jOutInterceptorProp.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST); wss4jOutInterceptorProp.put(WSHandlerConstants.PW_CALLBACK_REF, new CallbackHandler() @@ -101,5 +122,4 @@ public abstract class AbstractServiceTest extends TestCase return "admin"; } - } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortContentTest.java b/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortContentTest.java index 9718534588..920e3846d9 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortContentTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortContentTest.java @@ -1,5 +1,28 @@ -package org.alfresco.repo.cmis.ws; +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.ws; import java.io.InputStream; import java.io.Serializable; @@ -15,7 +38,6 @@ import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.coci.CheckOutCheckInService; import org.alfresco.service.cmr.model.FileFolderService; -import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; @@ -35,7 +57,7 @@ public class BaseServicePortContentTest extends BaseServicePortTest { protected CheckOutCheckInService checkOutCheckInService; - private static final String IMPORT = "import-for-cmis-ws-test.acp"; + private static final String IMPORT = "alfresco/import-for-test.acp"; protected static final String L0_FILE_0 = "L0-File-0"; protected static final String L0_FILE_1 = "L0-File-1"; @@ -65,9 +87,6 @@ public class BaseServicePortContentTest extends BaseServicePortTest protected NodeRef L1_FILE_VERSION_2_0_NODEREF; protected NodeRef L1_FILE_VERSION_1_0_NODEREF; - protected AssociationRef L0_FILE_1_TO_L0_FILE_0_ASSOCREF; - protected AssociationRef NONEXISTENT_ASSOCREF; - @Override protected void onSetUp() throws Exception { @@ -127,9 +146,6 @@ public class BaseServicePortContentTest extends BaseServicePortTest L1_FOLDER_1_NODEREF = fileFolderService.resolveNamePath(L0_FOLDER_0_NODEREF, Collections.singletonList(L1_FOLDER_1)).getNodeRef(); L0_NONEXISTENT_NODEREF = importForTest; - L0_FILE_1_TO_L0_FILE_0_ASSOCREF = nodeService.createAssociation(L0_FILE_1_NODEREF, L0_FILE_0_NODEREF, ContentModel.ASSOC_REFERENCES); - NONEXISTENT_ASSOCREF = new AssociationRef(L1_FILE_0_NODEREF, ContentModel.ASSOC_REFERENCES, L1_FILE_1_NODEREF); - authenticationComponent.clearCurrentSecurityContext(); } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortTest.java b/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortTest.java index 916e40f884..8658562eff 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortTest.java @@ -1,8 +1,33 @@ -package org.alfresco.repo.cmis.ws; +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.ws; import javax.transaction.UserTransaction; +import org.alfresco.cmis.CMISService; +import org.alfresco.cmis.dictionary.CMISMapping; import org.alfresco.model.ContentModel; import org.alfresco.repo.node.integrity.IntegrityChecker; import org.alfresco.repo.security.authentication.AuthenticationComponent; @@ -10,7 +35,6 @@ import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; -import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; @@ -31,6 +55,9 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex protected ServiceRegistry serviceRegistry; protected DictionaryService dictionaryService; + protected CMISMapping cmisMapping; + protected CMISService cmisService; + protected AuthenticationComponent authenticationComponent; private UserTransaction txn; @@ -51,6 +78,9 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex authenticationComponent = (AuthenticationComponent) applicationContext.getBean("authenticationComponent"); + cmisService = (CMISService) applicationContext.getBean("CMISService"); + cmisMapping = (CMISMapping) applicationContext.getBean("CMISMapping"); + authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); // start the transaction @@ -63,19 +93,8 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); // create a test store if need - StoreRef storeRef = new StoreRef("workspace://CmisTestWorkspace"); - if (nodeService.exists(storeRef) == false) - { - storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "CmisTestWorkspace"); - } - NodeRef storeRootNodeRef = nodeService.getRootNode(storeRef); - - rootNodeRef = new NodeRef(storeRef, "alf:root_folder"); - if (nodeService.exists(rootNodeRef) == false) - { - rootNodeRef = nodeService.createNode(storeRootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName(NamespaceService.ALFRESCO_URI, "root_folder"), - ContentModel.TYPE_FOLDER).getChildRef(); - } + rootNodeRef = nodeService.createNode(cmisService.getDefaultRootNodeRef(), ContentModel.ASSOC_CHILDREN, QName.createQName(NamespaceService.ALFRESCO_URI, "cmis_test_folder"), + ContentModel.TYPE_FOLDER).getChildRef(); authenticationComponent.clearCurrentSecurityContext(); } @@ -96,7 +115,58 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex @Override protected String[] getConfigLocations() { - return new String[] { "classpath:alfresco/application-context.xml", "classpath:test-cmis-context.xml" }; + return new String[] { "classpath:alfresco/application-context.xml", "classpath:alfresco/test-cmis-context.xml" }; + } + + protected String getPropertyIDValue(PropertiesType properties, String propertyName) + { + String result = null; + String realPropertyName = CMISPropNamesMapping.getResponsePropertyName(propertyName); + + for (PropertyIDType property : properties.getPropertyID()) + { + if (realPropertyName.equals(property.getName())) + { + result = property.getValue(); + break; + } + } + + return result; + } + + protected String getPropertyStringValue(PropertiesType properties, String propertyName) + { + String result = null; + String realPropertyName = CMISPropNamesMapping.getResponsePropertyName(propertyName); + + for (PropertyStringType property : properties.getPropertyString()) + { + if (realPropertyName.equals(property.getName())) + { + result = property.getValue(); + break; + } + } + + return result; + } + + protected boolean getPropertyBooleanValue(PropertiesType properties, String propertyName) + { + boolean result = false; + String realPropertyName = CMISPropNamesMapping.getResponsePropertyName(propertyName); + + for (PropertyBooleanType property : properties.getPropertyBoolean()) + { + if (realPropertyName.equals(property.getName())) + { + result = property.isValue(); + break; + } + } + + return result; } } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServicePortTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServicePortTest.java index e696f4dedd..9d59f612d6 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServicePortTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/DMNavigationServicePortTest.java @@ -1,16 +1,38 @@ -package org.alfresco.repo.cmis.ws; +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.ws; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.cmis.ws.OIDUtils; +import org.alfresco.cmis.dictionary.CMISMapping; import org.alfresco.service.cmr.repository.NodeRef; /** - * @see org.alfresco.cmis.ws.NavigationServicePortDM + * @see org.alfresco.repo.cmis.ws.NavigationServicePortDM * * @author Dmitry Lazurkin * @@ -32,11 +54,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetChildren request = new GetChildren(); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.FOLDERS); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF }; checkListExact(listing, 0, 3, expectedNodeRefs); } @@ -46,11 +68,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetChildren request = new GetChildren(); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.DOCUMENTS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.DOCUMENTS); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkListExact(listing, 3, 0, expectedNodeRefs); } @@ -61,11 +83,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setSkipCount(BigInteger.valueOf(1)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkList(listing, 5, 3, 3, expectedNodeRefs); } @@ -76,11 +98,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setMaxItems(BigInteger.valueOf(3)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkList(listing, 3, 3, 3, expectedNodeRefs); } @@ -91,11 +113,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setMaxItems(BigInteger.valueOf(10)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkList(listing, 6, 3, 3, expectedNodeRefs); } @@ -106,11 +128,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setSkipCount(BigInteger.valueOf(10)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkList(listing, 0, 3, 3, expectedNodeRefs); } @@ -122,11 +144,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setSkipCount(BigInteger.valueOf(5)); request.setMaxItems(BigInteger.valueOf(4)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkList(listing, 1, 3, 3, expectedNodeRefs); } @@ -137,11 +159,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest GetChildren request = new GetChildren(); request.setMaxItems(BigInteger.valueOf(0)); - request.setFolderId(OIDUtils.toOID(rootNodeRef)); - request.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + request.setFolderId(rootNodeRef.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); GetChildrenResponse response = navigationServicePort.getChildren(request); - List listing = response.getDocumentAndFolderCollection().getObject(); + List listing = response.getChildren().getChild(); NodeRef[] expectedNodeRefs = new NodeRef[] { L0_FOLDER_0_NODEREF, L0_FOLDER_1_NODEREF, L0_FOLDER_2_NODEREF, L0_FILE_0_NODEREF, L0_FILE_1_NODEREF, L0_FILE_2_NODEREF }; checkListExact(listing, 3, 3, expectedNodeRefs); } @@ -151,8 +173,8 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetChildren request = new GetChildren(); - request.setFolderId(OIDUtils.toOID(L0_FILE_0_NODEREF)); - request.setType(TypesOfObjectsEnum.FOLDERS); + request.setFolderId(L0_FILE_0_NODEREF.toString()); + request.setType(TypesOfFileableObjectsEnum.ANY); try { @@ -166,27 +188,7 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest fail("Expects exception"); } - public void testGetChildrenForRelationship() throws Exception - { - authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); - - GetChildren request = new GetChildren(); - request.setFolderId(OIDUtils.toOID(L0_FILE_1_TO_L0_FILE_0_ASSOCREF)); - request.setType(TypesOfObjectsEnum.FOLDERS); - - try - { - navigationServicePort.getChildren(request); - } - catch (FolderNotValidException e) - { - return; - } - - fail("Expects exception"); - } - - private void checkListExact(List objects, int expectedFileCount, int expectedFolderCount, NodeRef[] expectedNodeRefs) + private void checkListExact(List objects, int expectedFileCount, int expectedFolderCount, NodeRef[] expectedNodeRefs) { int fileCount = 0; int folderCount = 0; @@ -197,10 +199,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest check.add(nodeRef); } - for (DocumentOrFolderObjectType object : objects) + for (FolderTreeType object : objects) { - NodeRef nodeRef = OIDUtils.OIDtoNodeRef(object.getObjectID()); - if (dictionaryService.isSubClass(nodeService.getType(nodeRef), ContentModel.TYPE_FOLDER)) + NodeRef nodeRef = new NodeRef(getPropertyIDValue(object.getProperties(), CMISMapping.PROP_OBJECT_ID)); + + if (cmisMapping.isValidCmisFolder(cmisMapping.getCmisType(nodeService.getType(nodeRef)))) { folderCount++; } @@ -217,7 +220,7 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest assertEquals("Incorrect number of folders", expectedFolderCount, folderCount); } - private void checkList(List objects, int expectedCount, int expectedMaxFileCount, int expectedMaxFolderCount, NodeRef[] expectedNodeRefs) + private void checkList(List objects, int expectedCount, int expectedMaxFileCount, int expectedMaxFolderCount, NodeRef[] expectedNodeRefs) { int fileCount = 0; int folderCount = 0; @@ -228,10 +231,11 @@ public class DMNavigationServicePortTest extends BaseServicePortContentTest check.add(nodeRef); } - for (DocumentOrFolderObjectType object : objects) + for (FolderTreeType object : objects) { - NodeRef nodeRef = OIDUtils.OIDtoNodeRef(object.getObjectID()); - if (dictionaryService.isSubClass(nodeService.getType(nodeRef), ContentModel.TYPE_FOLDER)) + NodeRef nodeRef = new NodeRef(getPropertyIDValue(object.getProperties(), CMISMapping.PROP_OBJECT_ID)); + + if (cmisMapping.isValidCmisFolder(cmisMapping.getCmisType(nodeService.getType(nodeRef)))) { folderCount++; } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServicePortTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServicePortTest.java index 3fd0669a4c..9fce38a475 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServicePortTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServicePortTest.java @@ -1,16 +1,36 @@ +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ package org.alfresco.repo.cmis.ws; - -import java.math.BigInteger; - -import org.alfresco.repo.cmis.ws.OIDUtils; +import org.alfresco.cmis.dictionary.CMISMapping; import org.alfresco.service.cmr.repository.NodeRef; /** - * @see org.alfresco.cmis.ws.ObjectServicePortDM + * @see org.alfresco.repo.cmis.ws.ObjectServicePortDM * * @author Dmitry Lazurkin - * */ public class DMObjectServicePortTest extends BaseServicePortContentTest { @@ -29,12 +49,12 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(L0_FOLDER_0_NODEREF)); + request.setObjectId(L0_FOLDER_0_NODEREF.toString()); GetPropertiesResponse response = objectServicePort.getProperties(request); assertNotNull(response); - assertEquals(OIDUtils.toOID(rootNodeRef), response.getObject().getParent()); - assertEquals(L0_FOLDER_0, response.getObject().getName()); + assertEquals(rootNodeRef.toString(), getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_PARENT)); + assertEquals(L0_FOLDER_0, getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_NAME)); } public void testGetExistentDocumentPropertiesThis() throws Exception @@ -42,14 +62,12 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(L1_FILE_VERSION_1_0_NODEREF)); + request.setObjectId(L1_FILE_VERSION_1_0_NODEREF.toString()); GetPropertiesResponse response = objectServicePort.getProperties(request); assertNotNull(response); - assertEquals(response.getObject().getCheckinComment(), "1.0"); - assertEquals(response.getObject().isIsMajorVersion(), Boolean.TRUE); - assertEquals(response.getObject().isIsLatestMajorVersion(), Boolean.FALSE); - assertEquals(response.getObject().isIsLatestVersion(), Boolean.FALSE); + assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT), "1.0"); + assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_IS_MAJOR_VERSION)); } public void testGetExistentDocumentPropertiesLatestMajor() throws Exception @@ -58,14 +76,12 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest GetProperties request = new GetProperties(); request.setReturnVersion(VersionEnum.LATEST_MAJOR); - request.setObjectId(OIDUtils.toOID(L1_FILE_VERSION_1_0_NODEREF)); + request.setObjectId(L1_FILE_VERSION_1_0_NODEREF.toString()); GetPropertiesResponse response = objectServicePort.getProperties(request); assertNotNull(response); - assertEquals(response.getObject().getCheckinComment(), "2.0"); - assertEquals(response.getObject().isIsMajorVersion(), Boolean.TRUE); - assertEquals(response.getObject().isIsLatestMajorVersion(), Boolean.TRUE); - assertEquals(response.getObject().isIsLatestVersion(), Boolean.FALSE); + assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT), "2.0"); + assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_IS_MAJOR_VERSION)); } public void testGetExistentDocumentPropertiesLatest() throws Exception @@ -74,28 +90,12 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest GetProperties request = new GetProperties(); request.setReturnVersion(VersionEnum.LATEST); - request.setObjectId(OIDUtils.toOID(L1_FILE_VERSION_2_0_NODEREF)); + request.setObjectId(L1_FILE_VERSION_2_0_NODEREF.toString()); GetPropertiesResponse response = objectServicePort.getProperties(request); assertNotNull(response); - assertEquals(response.getObject().getCheckinComment(), "2.1"); - assertEquals(response.getObject().isIsMajorVersion(), Boolean.FALSE); - assertEquals(response.getObject().isIsLatestMajorVersion(), Boolean.FALSE); - assertEquals(response.getObject().isIsLatestVersion(), Boolean.TRUE); - } - - public void testGetExistentRelationshipProperties() throws Exception - { - authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); - - GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(L0_FILE_1_TO_L0_FILE_0_ASSOCREF)); - - GetPropertiesResponse response = objectServicePort.getProperties(request); - assertNotNull(response); - assertEquals(OIDUtils.toOID(L0_FILE_1_TO_L0_FILE_0_ASSOCREF.getSourceRef()), response.getObject().getSourceOID()); - assertEquals(OIDUtils.toOID(L0_FILE_1_TO_L0_FILE_0_ASSOCREF.getTargetRef()), response.getObject().getTargetOID()); - fail("Not implement"); + assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT), "2.1"); + assertFalse(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_IS_MAJOR_VERSION)); } public void testGetNonExistentObjectProperties() throws Exception @@ -103,26 +103,7 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(L0_NONEXISTENT_NODEREF)); - try - { - objectServicePort.getProperties(request); - } - catch (ObjectNotFoundException e) - { - return; - } - - fail("Expects exception"); - } - - public void testGetNonExistentRelationshipProperties() throws Exception - { - authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); - - GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(NONEXISTENT_ASSOCREF)); - + request.setObjectId(L0_NONEXISTENT_NODEREF.toString()); try { objectServicePort.getProperties(request); @@ -160,72 +141,53 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest NodeRef workingCopyNodeRef = checkOutCheckInService.checkout(L0_FILE_0_NODEREF); GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(L0_FILE_0_NODEREF)); + request.setObjectId(L0_FILE_0_NODEREF.toString()); GetPropertiesResponse response = objectServicePort.getProperties(request); assertNotNull(response); - assertNull(response.getObject().getCheckinComment()); - assertTrue(response.getObject().isIsMajorVersion()); - assertTrue(response.getObject().isIsLatestMajorVersion()); - assertTrue(response.getObject().isIsLatestVersion()); - assertTrue(response.getObject().isVersionSeriesIsCheckedOut()); - assertEquals(response.getObject().getVersionSeriesCheckedOutBy(), authenticationComponent.getSystemUserName()); - assertEquals(response.getObject().getVersionSeriesCheckedOutOID(), OIDUtils.toOID(workingCopyNodeRef)); + + assertNull(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT)); + assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT)); + assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY), authenticationComponent.getSystemUserName()); + assertEquals(getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID), workingCopyNodeRef.toString()); request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(workingCopyNodeRef)); + request.setObjectId(workingCopyNodeRef.toString()); response = objectServicePort.getProperties(request); assertNotNull(response); - assertNull(response.getObject().getCheckinComment()); - assertFalse(response.getObject().isIsMajorVersion()); - assertFalse(response.getObject().isIsLatestMajorVersion()); - assertFalse(response.getObject().isIsLatestVersion()); - assertTrue(response.getObject().isVersionSeriesIsCheckedOut()); - assertEquals(response.getObject().getVersionSeriesCheckedOutBy(), authenticationComponent.getSystemUserName()); - assertEquals(response.getObject().getVersionSeriesCheckedOutOID(), OIDUtils.toOID(workingCopyNodeRef)); + assertNull(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT)); + assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT)); + assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY), authenticationComponent.getSystemUserName()); + assertEquals(getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID), workingCopyNodeRef.toString()); } public void testGetContentStream() throws Exception { authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); - String documentId = OIDUtils.toOID(L0_FILE_0_NODEREF); - for (int offset = 0; offset < 10; offset++) + String documentId = L0_FILE_0_NODEREF.toString(); + GetContentStream contStream = new GetContentStream(); + contStream.setDocumentId(documentId); + GetContentStreamResponse result = objectServicePort.getContentStream(contStream); + assertNotNull(result); + if (result.getContentStream().length.intValue() != 9) { - for (int length = 0; length < 10; length++) - { - BigInteger offsetBig = new BigInteger(String.valueOf(offset)); - BigInteger lengthBig = new BigInteger(String.valueOf(length)); - - byte[] result = objectServicePort.getContentStream(documentId, offsetBig, lengthBig); - - assertNotNull(result); - if (result.length > length) - { - fail(); - } - } - + fail(); } - byte[] result = objectServicePort.getContentStream(documentId, null, null); - assertNotNull(result); - try - {result = objectServicePort.getContentStream("Invalid", null, null);} - catch (InvalidArgumentException e) {} - catch (Throwable e){fail();} - - try - {result = objectServicePort.getContentStream(documentId + "s", null, null);} - catch (ObjectNotFoundException e) {} - catch (Throwable e){fail();} - - try - {result = objectServicePort.getContentStream(OIDUtils.toOID(L0_FOLDER_0_NODEREF), null, null);} - catch (StreamNotSupportedException e) {} - catch (Throwable e){fail();} - + { + contStream.setDocumentId(documentId + "s"); + result = objectServicePort.getContentStream(contStream); + } + catch (ObjectNotFoundException e) + { + } + catch (Throwable e) + { + fail(); + } } -} + +} \ No newline at end of file diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java index 53e32e2349..291f9a35c8 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/DMObjectServiceTest.java @@ -1,15 +1,11 @@ package org.alfresco.repo.cmis.ws; - -import java.math.BigInteger; import java.net.MalformedURLException; import java.net.URL; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.alfresco.repo.cmis.ws.OIDUtils; - public class DMObjectServiceTest extends AbstractServiceTest { @@ -34,7 +30,7 @@ public class DMObjectServiceTest extends AbstractServiceTest public void testGetDocumentProperties() throws Exception { GetProperties request = new GetProperties(); - request.setObjectId(OIDUtils.toOID(ALFRESCO_TUTORIAL_NODE_REF)); + request.setObjectId(ALFRESCO_TUTORIAL_NODE_REF.toString()); GetPropertiesResponse response = ((ObjectServicePort) servicePort).getProperties(request); assertNotNull(response); @@ -62,43 +58,27 @@ public class DMObjectServiceTest extends AbstractServiceTest public void testGetContentStream() throws Exception { - String documentId = OIDUtils.toOID(ALFRESCO_TUTORIAL_NODE_REF); + String documentId = ALFRESCO_TUTORIAL_NODE_REF.toString(); - for (int offset = 0; offset < 10; offset++) + GetContentStream contStream = new GetContentStream(); + contStream.setDocumentId(documentId); + GetContentStreamResponse result = ((ObjectServicePort) servicePort).getContentStream(contStream); + if (result.getContentStream().length.intValue() == 0) { - for (int length = 0; length < 10; length++) - { - BigInteger offsetBig = new BigInteger(String.valueOf(offset)); - BigInteger lengthBig = new BigInteger(String.valueOf(length)); - - byte[] result = ((ObjectServicePort) servicePort).getContentStream(documentId, offsetBig, lengthBig); - - assertNotNull(result); - if (result.length > length) - { - fail(); - } - } - + fail(); } - byte[] result = ((ObjectServicePort) servicePort).getContentStream(documentId, null, BigInteger.valueOf(20)); - assertNotNull(result); - try - {result = ((ObjectServicePort) servicePort).getContentStream("Invalid", null, null);} - catch (InvalidArgumentException e) {} - catch (Throwable e){fail();} - - try - {result = ((ObjectServicePort) servicePort).getContentStream(documentId + "s", null, null);} - catch (ObjectNotFoundException e) {} - catch (Throwable e){fail();} - - try - {result = ((ObjectServicePort) servicePort).getContentStream(OIDUtils.toOID(COMPANY_HOME_NODE_REF), null, null);} - catch (StreamNotSupportedException e) {} - catch (Throwable e){fail();} - + { + contStream.setDocumentId(documentId + "s"); + {result = ((ObjectServicePort) servicePort).getContentStream(contStream);} + } + catch (ObjectNotFoundException e) + { + } + catch (Throwable e) + { + fail(); + } } } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePortTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePortTest.java index 8b1a3b25a9..20939b3a89 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePortTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServicePortTest.java @@ -1,10 +1,35 @@ +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ package org.alfresco.repo.cmis.ws; +import java.util.List; -import org.alfresco.repo.cmis.ws.OIDUtils; +import org.alfresco.repo.cmis.ws.RepositoryServicePort; /** - * @see org.alfresco.cmis.ws.RepositoryServicePortDM + * @see org.alfresco.repo.cmis.ws.RepositoryServicePortDM * * @author Dmitry Lazurkin * @@ -21,16 +46,26 @@ public class DMRepositoryServicePortTest extends BaseServicePortTest repositoryServicePort = (RepositoryServicePort) applicationContext.getBean("dmRepositoryService"); } - public void testGetRootFolder() throws Exception + public void testGetRepositoryServicePort() throws Exception { authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName()); - GetRootFolder request = new GetRootFolder(); - request.setFilter("*"); - - GetRootFolderResponse response = repositoryServicePort.getRootFolder(request); - FolderObjectType rootFolder = response.getRootFolder(); - assertEquals(rootNodeRef, OIDUtils.OIDtoNodeRef(rootFolder.getObjectID())); + List repositories = repositoryServicePort.getRepositories(); + assertTrue(repositories.size() == 1); + assertFalse(repositories.get(0).getRepositoryID() == null); + assertFalse(repositories.get(0).getRepositoryName() == null); } + public void testGetRepositoryInfo() throws Exception + { + List repositories = repositoryServicePort.getRepositories(); + RepositoryInfoType repositoryInfo = repositoryServicePort.getRepositoryInfo(repositories.get(0).getRepositoryID()); + + assertTrue(repositoryInfo.getRepositoryId().equals(repositories.get(0).getRepositoryID())); + assertTrue(repositoryInfo.getRepositoryName().equals(repositories.get(0).getRepositoryName())); + assertTrue("Alfresco".equals(repositoryInfo.getVendorName())); + CapabilitiesType capabilities = repositoryInfo.getCapabilities(); + assertTrue(capabilities.isCapabilityMultifiling() && capabilities.isCapabilityPWCUpdatable()); + assertFalse(capabilities.isCapabilityUnfiling() && capabilities.isCapabilityVersionSpecificFiling()); + } } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServiceTest.java b/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServiceTest.java index ff0f030b23..05b3461ec6 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServiceTest.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/DMRepositoryServiceTest.java @@ -1,12 +1,38 @@ -package org.alfresco.repo.cmis.ws; +/* + * Copyright (C) 2005-2008 Alfresco Software Limited. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + * As a special exception to the terms and conditions of version 2.0 of + * the GPL, you may redistribute this Program in connection with Free/Libre + * and Open Source Software ("FLOSS") applications as described in Alfresco's + * FLOSS exception. You should have recieved a copy of the text describing + * the FLOSS exception, and it is also available here: + * http://www.alfresco.com/legal/licensing" + */ +package org.alfresco.repo.cmis.ws; import java.net.MalformedURLException; import java.net.URL; +import java.util.List; import javax.xml.namespace.QName; import javax.xml.ws.Service; +import org.alfresco.repo.cmis.ws.RepositoryServicePort; + /** * @author Michael Shavnev */ @@ -31,13 +57,14 @@ public class DMRepositoryServiceTest extends AbstractServiceTest return service.getPort(RepositoryServicePort.class); } - public void testGetRootFolder() + public void testGetRepositories() { - GetRootFolder getRootFolder = new GetRootFolder(); try { - getRootFolder.setFilter("*"); - ((RepositoryServicePort) servicePort).getRootFolder(getRootFolder); + List repositories = ((RepositoryServicePort) servicePort).getRepositories(); + assertTrue(repositories.size() == 1); + assertFalse(repositories.get(0).getRepositoryID() == null); + assertFalse(repositories.get(0).getRepositoryName() == null); } catch (Throwable e) { @@ -45,21 +72,29 @@ public class DMRepositoryServiceTest extends AbstractServiceTest fail(); } - try - { - getRootFolder.setFilter("name"); - ((RepositoryServicePort) servicePort).getRootFolder(getRootFolder); - fail(); - } - catch (FilterNotValidException e) - { - // expected - } - catch (Throwable e) - { - e.printStackTrace(); - fail(); - } } + public void testGetRepositoryInfo() + { + try + { + List repositories = ((RepositoryServicePort) servicePort).getRepositories(); + RepositoryInfoType repositoryInfo = ((RepositoryServicePort) servicePort).getRepositoryInfo(repositories.get(0).getRepositoryID()); + + assertTrue(repositoryInfo.getRepositoryId().equals(repositories.get(0).getRepositoryID())); + assertTrue(repositoryInfo.getRepositoryName().equals(repositories.get(0).getRepositoryName())); + assertTrue("Alfresco".equals(repositoryInfo.getVendorName())); + assertTrue(repositoryInfo.getVendorName().indexOf("Alfresco Repository (") > -1 ); + CapabilitiesType capabilities = repositoryInfo.getCapabilities(); + assertTrue(capabilities.isCapabilityMultifiling() && capabilities.isCapabilityPWCUpdatable()); + assertFalse(capabilities.isCapabilityUnfiling() && capabilities.isCapabilityVersionSpecificFiling()); + + } + catch (Throwable e) + { + e.printStackTrace(); + fail(); + } + + } } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/example/ExecutableServicesHelper.java b/source/test/java/org/alfresco/repo/cmis/ws/example/ExecutableServicesHelper.java index 58d02e185f..1be2e623a7 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/example/ExecutableServicesHelper.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/example/ExecutableServicesHelper.java @@ -37,13 +37,14 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import org.alfresco.repo.cmis.ws.DocumentOrFolderObjectType; +import org.alfresco.repo.cmis.ws.FolderTreeType; import org.alfresco.repo.cmis.ws.GetChildren; import org.alfresco.repo.cmis.ws.GetChildrenResponse; -import org.alfresco.repo.cmis.ws.GetRootFolder; import org.alfresco.repo.cmis.ws.NavigationServicePort; +import org.alfresco.repo.cmis.ws.RepositoryInfoType; import org.alfresco.repo.cmis.ws.RepositoryServicePort; -import org.alfresco.repo.cmis.ws.TypesOfObjectsEnum; +import org.alfresco.repo.cmis.ws.RepositoryType; +import org.alfresco.repo.cmis.ws.TypesOfFileableObjectsEnum; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; @@ -125,10 +126,10 @@ public class ExecutableServicesHelper * entity types. * * @param servicesPort - NavigationServicePort configured with WSS4J Client instance - * @return List< DocumentOrFolderObjectType> - list of all children elements of Company Home folder + * @return List - list of all children elements of Company Home folder * @throws Exception This exception throws when any CMIS Services operations was failed */ - public List receiveSpaceContent(NavigationServicePort servicesPort) throws Exception + public List receiveSpaceContent(NavigationServicePort servicesPort) throws Exception { GetChildrenResponse response; @@ -136,9 +137,9 @@ public class ExecutableServicesHelper { response = servicesPort.getChildren(configureGetChildrenServiceQuery()); - if ((response != null) && (response.getDocumentAndFolderCollection() != null)) + if ((response != null) && (response.getChildren().getChild() != null)) { - return response.getDocumentAndFolderCollection().getObject(); + return response.getChildren().getChild(); } else { @@ -162,9 +163,16 @@ public class ExecutableServicesHelper { try { - GetRootFolder requestParameters = new GetRootFolder(); - - return servicesPort.getRootFolder(requestParameters).getRootFolder().getObjectID(); + List repositories = servicesPort.getRepositories(); + if (repositories.isEmpty()) + { + throw new RuntimeException("List of repositories is empty"); + } + else + { + RepositoryInfoType repositoryInfo = servicesPort.getRepositoryInfo(repositories.get(0).getRepositoryID()); + return repositoryInfo.getRootFolderId(); + } } catch (Exception e) { @@ -191,7 +199,7 @@ public class ExecutableServicesHelper GetChildren requestParameters = new GetChildren(); requestParameters.setFilter("*"); requestParameters.setFolderId(receiveCompanyHomeObjectId(receiveAuthorizedRepositoryServicePort())); - requestParameters.setType(TypesOfObjectsEnum.FOLDERS_AND_DOCUMETS); + requestParameters.setType(TypesOfFileableObjectsEnum.ANY); return requestParameters; } diff --git a/source/test/java/org/alfresco/repo/cmis/ws/example/SimpleExecutableCmisServicesUtilizer.java b/source/test/java/org/alfresco/repo/cmis/ws/example/SimpleExecutableCmisServicesUtilizer.java index cbbbd7c39a..ca5db3c330 100644 --- a/source/test/java/org/alfresco/repo/cmis/ws/example/SimpleExecutableCmisServicesUtilizer.java +++ b/source/test/java/org/alfresco/repo/cmis/ws/example/SimpleExecutableCmisServicesUtilizer.java @@ -26,7 +26,9 @@ package org.alfresco.repo.cmis.ws.example; import java.util.List; -import org.alfresco.repo.cmis.ws.DocumentOrFolderObjectType; +import org.alfresco.repo.cmis.ws.FolderTreeType; +import org.alfresco.repo.cmis.ws.PropertiesType; +import org.alfresco.repo.cmis.ws.PropertyStringType; /** * This class executes simple processing for prompting server address and user name and password for authentication this user on specified server. After successful connection this @@ -45,7 +47,7 @@ import org.alfresco.repo.cmis.ws.DocumentOrFolderObjectType; */ public class SimpleExecutableCmisServicesUtilizer { - private static final String FOLDER_IDENTIFICATOR_SAMPLE_STRING = "}folder"; + private static final String FOLDER_IDENTIFICATOR_SAMPLE_STRING = "folder"; /** * Executable entry point - represents main life cycle @@ -84,7 +86,7 @@ public class SimpleExecutableCmisServicesUtilizer return; } - List response; + List response; try { @@ -97,17 +99,33 @@ public class SimpleExecutableCmisServicesUtilizer } System.out.println("Outing Company Home contents:"); - for (DocumentOrFolderObjectType item : response) + for (FolderTreeType item : response) { - if (item.getBaseObjectType().contains(FOLDER_IDENTIFICATOR_SAMPLE_STRING)) + if (getPropertyStringValue(item.getProperties(), "baseType").contains(FOLDER_IDENTIFICATOR_SAMPLE_STRING)) { - System.out.println("[" + item.getName() + "]"); + System.out.println("[" + getPropertyStringValue(item.getProperties(), "name") + "]"); } else { - System.out.println(item.getName()); + System.out.println(getPropertyStringValue(item.getProperties(), "name")); } } } + private static String getPropertyStringValue(PropertiesType properties, String propertyName) + { + String result = null; + + for (PropertyStringType property : properties.getPropertyString()) + { + if (propertyName.equals(property.getName())) + { + result = property.getValue(); + break; + } + } + + return result; + } + } diff --git a/source/wsdl/DiscoveryService.wsdl b/source/wsdl/DiscoveryService.wsdl new file mode 100755 index 0000000000..d1fc2cf1bd --- /dev/null +++ b/source/wsdl/DiscoveryService.wsdl @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/MultiFilingService.wsdl b/source/wsdl/MultiFilingService.wsdl new file mode 100755 index 0000000000..13f5d1136c --- /dev/null +++ b/source/wsdl/MultiFilingService.wsdl @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/NavigationService.wsdl b/source/wsdl/NavigationService.wsdl index 1dc4c4e891..3ee3fabc69 100644 --- a/source/wsdl/NavigationService.wsdl +++ b/source/wsdl/NavigationService.wsdl @@ -1,252 +1,326 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/ObjectService.wsdl b/source/wsdl/ObjectService.wsdl index 2870c550d1..3c19b47086 100644 --- a/source/wsdl/ObjectService.wsdl +++ b/source/wsdl/ObjectService.wsdl @@ -1,493 +1,743 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/PolicyService.wsdl b/source/wsdl/PolicyService.wsdl new file mode 100755 index 0000000000..76d3b02326 --- /dev/null +++ b/source/wsdl/PolicyService.wsdl @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/RelationshipService.wsdl b/source/wsdl/RelationshipService.wsdl new file mode 100755 index 0000000000..ca9d6300e4 --- /dev/null +++ b/source/wsdl/RelationshipService.wsdl @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/RepositoryService.wsdl b/source/wsdl/RepositoryService.wsdl index 72d19c3d0c..270fb2c657 100644 --- a/source/wsdl/RepositoryService.wsdl +++ b/source/wsdl/RepositoryService.wsdl @@ -1,173 +1,235 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/VersioningService.wsdl b/source/wsdl/VersioningService.wsdl new file mode 100755 index 0000000000..15e22fff7c --- /dev/null +++ b/source/wsdl/VersioningService.wsdl @@ -0,0 +1,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/cmisMessageTypes.xsd b/source/wsdl/cmisMessageTypes.xsd index fcb227dbf8..74af093959 100644 --- a/source/wsdl/cmisMessageTypes.xsd +++ b/source/wsdl/cmisMessageTypes.xsd @@ -1,772 +1,809 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/wsdl/cmisObjectTypes.xsd b/source/wsdl/cmisObjectTypes.xsd index cf42eb7f05..28b9d0504c 100644 --- a/source/wsdl/cmisObjectTypes.xsd +++ b/source/wsdl/cmisObjectTypes.xsd @@ -1,240 +1,307 @@ - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file