You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2009/07/30 18:33:31 UTC
svn commit: r799355 - in /incubator/chemistry/trunk/chemistry:
chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/
chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/
chemistry-atompub/src/main/java/...
Author: fguillaume
Date: Thu Jul 30 16:33:31 2009
New Revision: 799355
URL: http://svn.apache.org/viewvc?rev=799355&view=rev
Log:
CMIS-44: move collectionType attribute to cmisra namespace
Modified:
incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java
incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java
incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java?rev=799355&r1=799354&r2=799355&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java Thu Jul 30 16:33:31 2009
@@ -68,7 +68,7 @@
QName name = reader.getName();
if (name.equals(Atom.APP_COLLECTION)) {
String href = reader.getAttributeValue("href");
- String type = reader.getAttributeValue("collectionType"); // XXX
+ String type = reader.getAttributeValue(CMIS.RESTATOM_COLLECTION_TYPE.getLocalPart());
addCollection(repo, href, type);
} else if (name.equals(CMIS.REPOSITORY_INFO)) {
RepositoryInfo info = readRepositoryInfo(context,
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java?rev=799355&r1=799354&r2=799355&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java Thu Jul 30 16:33:31 2009
@@ -65,7 +65,7 @@
RepositoryInfoWriter.write(sw, provider);
for (CollectionInfo ci : wi.getCollections(request)) {
sw.startCollection(ci.getHref(request));
- sw.writeAttribute(CMIS.COLLECTION_TYPE,
+ sw.writeAttribute(CMIS.RESTATOM_COLLECTION_TYPE,
((CMISCollection<?>) ci).getType());
sw.writeTitle(ci.getTitle(request));
sw.writeAccepts(ci.getAccepts(request));
Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java?rev=799355&r1=799354&r2=799355&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java Thu Jul 30 16:33:31 2009
@@ -87,8 +87,6 @@
public static final QName REPOSITORY_SPECIFIC_INFORMATION = CMISName("repositorySpecificInformation");
- public static final QName COLLECTION_TYPE = CMISName("collectionType");
-
public static final QName DOCUMENT_TYPE = CMISName("documentType");
public static final QName FOLDER_TYPE = CMISName("folderType");
@@ -211,6 +209,8 @@
* ----- CMIS REST Atom Qualified Names-----
*/
+ public static final QName RESTATOM_COLLECTION_TYPE = CMISRAName("collectionType");
+
public static final QName RESTATOM_URI_TEMPLATE = CMISRAName("uritemplate");
public static final QName RESTATOM_TEMPLATE = CMISRAName("template");