chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dcaru...@apache.org
Subject svn commit: r823626 [1/8] - in /incubator/chemistry/trunk/chemistry: chemistry-tck-atompub/ chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/ chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/ chemistry-tck-...
Date Fri, 09 Oct 2009 17:25:21 GMT
Author: dcaruana
Date: Fri Oct  9 17:25:19 2009
New Revision: 823626

URL: http://svn.apache.org/viewvc?rev=823626&view=rev
Log:
AtomPub TCK 0.7 upgrade - checkpoint

1) CHANGED: CMIS Namespaces

Was: http://docs.oasis-open.org/ns/cmis/core/200901
     http://docs.oasis-open.org/ns/cmis/messaging/200901
     http://docs.oasis-open.org/ns/cmis/restatom/200901
Now: http://docs.oasis-open.org/ns/cmis/core/200908/
     http://docs.oasis-open.org/ns/cmis/messaging/200908/
     http://docs.oasis-open.org/ns/cmis/restatom/200908/

2) REMOVED: repositoryInfo from Service Document

CMIS-464

3) CHANGED: lastChangeToken in Service Document

Was: lastChangeToken
Now: latestChangeLogToken

CMIS-341

4) CHANGED: capabilityChangesOnType

Was: capabilityChangesOnType in capabilities
Now: changesOnType in repositoryInfo

CMIS-407

5) ADDED: capabilityGetFolderTree

CMIS-unknown

6) CHANGED: capabilityPWCUpdateable

Was: capabilityPWCUpdateable
Now: capabilityPWCUpdatable

CMIS-unknown

7) CHANGED: cmisra:collectionType

Was: attribute on service document collection
Now: element in service document collection

CMIS-371

8) CHANGED: property pdId

Was: pdId
Now: propertyDefinitionId

CMIS-411

----- checkpoint -------

9) CHANGED: type baseTypeId

Was: baseTypeId
Now: baseId

CMIS-491, CMIS-405

10) CHANGED: type fulltextindexed

Was: fulltextindexed
Now: fulltextIndexed

CMIS-422

11) ADDED: type cmisra:id

CMIS-492

12) REMOVED: xml property type

CMIS-439

13) ADDED: allowable action canGetFolderTree

14) CHANGED: allowable action canGetRelationships

Was: canGetRelationships
Now: canGetObjectRelationships

15) ADDED: relationship type allowed source/target types

Note: CMIS-569 issue

16) CHANGED: case of identifier names

Was: UpperCase
Now: camelCase

CMIS-396

17) CHANGED: property PathName

Was: PathName
Now: path

CMIS-350

----- checkpoint -------

18) ADDED: support for cmisra:content streams

CMIS-308

----- checkpoint -------

19) CHANGED: all-versions link

Was: all-versions
Now: version-history

CMIS-388

20) REMOVED: repositoryRelationship

CMIS-464

21) CHANGED: overwriteFlag error code

Was: HTTP 500
Now: HTTP 409

22) CHANGED: getTypeDescendants

Was: depth default to 1
Now: depth default to -1
Was: depth of 0 valid
Now: depth of 0 invalid

CMIS-410

23) ADDED: cmis:numItems in feeds

CMIS-357

Added:
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/java/org/apache/chemistry/abdera/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/java/org/apache/chemistry/abdera/ext/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/java/org/apache/chemistry/abdera/ext/test/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/java/org/apache/chemistry/abdera/ext/test/CMISContentTest.java   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/abdera/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/abdera/ext/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/abdera/ext/examples/
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/abdera/ext/examples/cmiscontent.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/ACL.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeChildren.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypePolicyWith.xml   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypePolicyWithout.xml   (with props)
Removed:
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/templates/
    incubator/chemistry/trunk/chemistry/chemistry-ws/src/main/resources/wsdl/xhtml1-strict.xsd
Modified:
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/README.txt
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISExtensionFactory.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISProperty.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISValidator.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/TypeDefinitionTest.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createrelationship.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomdocument.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomfolder.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/updatecustomdocument.atomentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/query.cmisquery.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/queryallowableactions.cmisquery.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/APP.xsd
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/CMIS-Core.xsd
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/CMIS-RestAtom.xsd
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/xml.xsd
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/java/org/apache/chemistry/tck/atompub/test/schema/CMISSchemaTest.java
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/AllowableActions.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/ChangeLog.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/DocumentEntry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/DocumentEntryPWC.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/DocumentEntryWithChanges.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/FolderChildren.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/FolderDescendants.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/FolderEntry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/PolicyEntry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/Query.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/RelationshipEntry.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/Service.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeDocumentWith.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeDocumentWithout.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeFolderWith.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeFolderWithout.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeRelationshipWith.xml
    incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/test/resources/org/apache/chemistry/tck/atompub/examples/TypeRelationshipWithout.xml

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/README.txt
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/README.txt?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/README.txt (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/README.txt Fri Oct  9 17:25:19 2009
@@ -40,7 +40,7 @@
 
 Tests are executed with:
 
-mvn test -p<provider>
+mvn test -P<provider>
 
 where:
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java Fri Oct  9 17:25:19 2009
@@ -25,9 +25,9 @@
 public interface CMISConstants {
     
     // Namespace
-    public static final String CMIS_NS = "http://docs.oasis-open.org/ns/cmis/core/200901";
-    public static final String CMISRA_NS = "http://docs.oasis-open.org/ns/cmis/restatom/200901";
-    public static final String CMISLINK_NS = "http://docs.oasis-open.org/ns/cmis/link/200901";
+    public static final String CMIS_NS = "http://docs.oasis-open.org/ns/cmis/core/200908/";
+    public static final String CMISRA_NS = "http://docs.oasis-open.org/ns/cmis/restatom/200908/";
+    public static final String CMISLINK_NS = "http://docs.oasis-open.org/ns/cmis/link/200908/";
 
     // Mimetypes
     public static final String MIMETYPE_ENTRY = "application/atom+xml;type=entry";
@@ -73,7 +73,7 @@
     // CMIS Object
     public static final QName OBJECT = new QName(CMISRA_NS, "object");
     public static final QName PROPERTIES = new QName(CMIS_NS, "properties");
-    public static final QName PROPERTY_ID = new QName("pdid");
+    public static final QName PROPERTY_ID = new QName("propertyDefinitionId");
     public static final QName PROPERTY_DISPLAY_NAME = new QName("displayName");
     public static final QName PROPERTY_VALUE = new QName(CMIS_NS, "value");
     public static final QName STRING_PROPERTY = new QName(CMIS_NS, "propertyString");
@@ -83,9 +83,16 @@
     public static final QName DATETIME_PROPERTY = new QName(CMIS_NS, "propertyDateTime");
     public static final QName URI_PROPERTY = new QName(CMIS_NS, "propertyUri");
     public static final QName ID_PROPERTY = new QName(CMIS_NS, "propertyId");
-    public static final QName XML_PROPERTY = new QName(CMIS_NS, "propertyXml");
     public static final QName HTML_PROPERTY = new QName(CMIS_NS, "propertyHtml");
 
+    // CMIS Content
+    public static final QName CONTENT = new QName(CMISRA_NS, "content");
+    public static final QName CONTENT_MEDIATYPE = new QName(CMISRA_NS, "mediatype");
+    public static final QName CONTENT_BASE64 = new QName(CMISRA_NS, "base64");
+    
+    // CMIS Number of Items
+    public static final QName NUM_ITEMS = new QName(CMISRA_NS, "numItems");
+    
     // CMIS Data Types
     public static final String DATATYPE_STRING = "string";
     public static final String DATATYPE_DECIMAL = "decimal";
@@ -94,7 +101,6 @@
     public static final String DATATYPE_DATETIME = "datetime";
     public static final String DATATYPE_URI = "uri";
     public static final String DATATYPE_ID = "id";
-    public static final String DATATYPE_XML = "xml";
     public static final String DATATYPE_HTML = "html";
 
     // CMIS Relationships
@@ -102,7 +108,7 @@
     public static final String REL_UP = "up";
     public static final String REL_DOWN = "down";
     public static final String REL_DESCRIBED_BY = "describedby";
-    public static final String REL_VERSION_HISTORY = "all-versions";
+    public static final String REL_VERSION_HISTORY = "version-history";
     public static final String REL_CURRENT_VERSION = "current-version";
     public static final String REL_WORKING_COPY = "working-copy";
     public static final String REL_ROOT_DESCENDANTS = CMISLINK_NS + "/rootdescendants";
@@ -125,7 +131,6 @@
     public static final String PROP_TYPE_DATETIME = "datetime";
     public static final String PROP_TYPE_URI = "uri";
     public static final String PROP_TYPE_ID = "id";
-    public static final String PROP_TYPE_XML = "xml";
     public static final String PROP_TYPE_HTML = "html";
 
     // CMIS Allowable Actions
@@ -133,10 +138,11 @@
     public static final QName CAN_DELETE = new QName(CMIS_NS, "canDelete");
     public static final QName CAN_UPDATE_PROPERTIES = new QName(CMIS_NS, "canUpdateProperties");
     public static final QName CAN_GET_PROPERTIES = new QName(CMIS_NS, "canGetProperties");
-    public static final QName CAN_GET_RELATIONSHIPS = new QName(CMIS_NS, "canGetRelationships");
+    public static final QName CAN_GET_OBJECT_RELATIONSHIPS = new QName(CMIS_NS, "canGetObjectRelationships");
     public static final QName CAN_GET_PARENTS = new QName(CMIS_NS, "canGetParents");
     public static final QName CAN_GET_FOLDER_PARENT = new QName(CMIS_NS, "canGetFolderParent");
     public static final QName CAN_GET_DESCENDANTS = new QName(CMIS_NS, "canGetDescendants");
+    public static final QName CAN_GET_FOLDER_TREE = new QName(CMIS_NS, "canGetFolderTree");
     public static final QName CAN_MOVE = new QName(CMIS_NS, "canMove");
     public static final QName CAN_DELETE_VERSION = new QName(CMIS_NS, "canDeleteVersion");
     public static final QName CAN_DELETE_CONTENT = new QName(CMIS_NS, "canDeleteContent");
@@ -165,31 +171,31 @@
     public static final String TYPE_POLICY = "cmis:policy";
 
     // CMIS Properties Names
-    public static final String PROP_NAME = "cmis:Name";
-    public static final String PROP_OBJECT_ID = "cmis:ObjectId";
-    public static final String PROP_BASE_TYPE_ID = "cmis:BaseTypeId";
-    public static final String PROP_OBJECT_TYPE_ID = "cmis:ObjectTypeId";
-    public static final String PROP_CREATED_BY = "cmis:CreatedBy";
-    public static final String PROP_CREATION_DATE = "cmis:CreationDate";
-    public static final String PROP_LAST_MODIFIED_BY = "cmis:LastModifiedBy";
-    public static final String PROP_LAST_MODIFICATION_DATE = "cmis:LastModificationDate";
-    public static final String PROP_IS_IMMUTABLE = "cmis:IsImmutable";
-    public static final String PROP_IS_LATEST_VERSION = "cmis:IsLatestVersion";
-    public static final String PROP_IS_MAJOR_VERSION = "cmis:IsMajorVersion";
-    public static final String PROP_IS_LATEST_MAJOR_VERSION = "cmis:IsLatestMajorVersion";
-    public static final String PROP_VERSION_LABEL = "cmis:VersionLabel";
-    public static final String PROP_VERSION_SERIES_ID = "cmis:VersionSeriesId";
-    public static final String PROP_IS_VERSION_SERIES_CHECKED_OUT = "cmis:IsVersionSeriesCheckedOut";
-    public static final String PROP_VERSION_SERIES_CHECKED_OUT_BY = "cmis:VersionSeriesCheckedOutBy";
-    public static final String PROP_VERSION_SERIES_CHECKED_OUT_ID = "cmis:VersionSeriesCheckedOutId";
-    public static final String PROP_CHECKIN_COMMENT = "cmis:CheckinComment";
-    public static final String PROP_CONTENT_STREAM_LENGTH = "cmis:ContentStreamLength";
-    public static final String PROP_CONTENT_STREAM_MIMETYPE = "cmis:ContentStreamMimetype";
-    public static final String PROP_CONTENT_STREAM_FILENAME = "cmis:ContentStreamFilename";
-    public static final String PROP_CONTENT_STREAM_ID = "cmis:ContentStreamId";
-    public static final String PROP_PATH = "cmis:PathName";
-    public static final String PROP_SOURCE_ID = "cmis:SourceId";
-    public static final String PROP_TARGET_ID = "cmis:TargetId";
-    public static final String PROP_PARENT_ID = "cmis:ParentId";
+    public static final String PROP_NAME = "cmis:name";
+    public static final String PROP_OBJECT_ID = "cmis:objectId";
+    public static final String PROP_BASE_TYPE_ID = "cmis:baseTypeId";
+    public static final String PROP_OBJECT_TYPE_ID = "cmis:objectTypeId";
+    public static final String PROP_CREATED_BY = "cmis:createdBy";
+    public static final String PROP_CREATION_DATE = "cmis:creationDate";
+    public static final String PROP_LAST_MODIFIED_BY = "cmis:lastModifiedBy";
+    public static final String PROP_LAST_MODIFICATION_DATE = "cmis:lastModificationDate";
+    public static final String PROP_IS_IMMUTABLE = "cmis:isImmutable";
+    public static final String PROP_IS_LATEST_VERSION = "cmis:isLatestVersion";
+    public static final String PROP_IS_MAJOR_VERSION = "cmis:isMajorVersion";
+    public static final String PROP_IS_LATEST_MAJOR_VERSION = "cmis:isLatestMajorVersion";
+    public static final String PROP_VERSION_LABEL = "cmis:versionLabel";
+    public static final String PROP_VERSION_SERIES_ID = "cmis:versionSeriesId";
+    public static final String PROP_IS_VERSION_SERIES_CHECKED_OUT = "cmis:isVersionSeriesCheckedOut";
+    public static final String PROP_VERSION_SERIES_CHECKED_OUT_BY = "cmis:versionSeriesCheckedOutBy";
+    public static final String PROP_VERSION_SERIES_CHECKED_OUT_ID = "cmis:versionSeriesCheckedOutId";
+    public static final String PROP_CHECKIN_COMMENT = "cmis:checkinComment";
+    public static final String PROP_CONTENT_STREAM_LENGTH = "cmis:contentStreamLength";
+    public static final String PROP_CONTENT_STREAM_MIMETYPE = "cmis:contentStreamMimetype";
+    public static final String PROP_CONTENT_STREAM_FILENAME = "cmis:contentStreamFilename";
+    public static final String PROP_CONTENT_STREAM_ID = "cmis:contentStreamId";
+    public static final String PROP_PATH = "cmis:path";
+    public static final String PROP_SOURCE_ID = "cmis:sourceId";
+    public static final String PROP_TARGET_ID = "cmis:targetId";
+    public static final String PROP_PARENT_ID = "cmis:parentId";
 
 }

Added: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java?rev=823626&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java Fri Oct  9 17:25:19 2009
@@ -0,0 +1,107 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Authors:
+ *     David Caruana, Alfresco
+ */
+package org.apache.chemistry.abdera.ext;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.activation.DataHandler;
+import javax.activation.MimeType;
+import javax.xml.namespace.QName;
+
+import org.apache.abdera.factory.Factory;
+import org.apache.abdera.model.Element;
+import org.apache.abdera.model.ExtensibleElementWrapper;
+import org.apache.axiom.attachments.utils.DataHandlerUtils;
+
+
+/**
+ * CMIS Content for the Abdera ATOM library.
+ * 
+ *  <xs:complexType name="cmisContentType">
+ *      <xs:sequence>
+ *         <xs:element name="mediatype" type="xs:string" />
+ *         <xs:element name="base64" type="xs:string" />
+ *         <xs:any processContents="lax" namespace="##other" minOccurs="0" maxOccurs="unbounded" />
+ *      </xs:sequence>
+ *  </xs:complexType>
+ *
+ */
+public class CMISContent extends ExtensibleElementWrapper {
+    
+    /**
+     * @param internal
+     */
+    public CMISContent(Element internal) {
+        super(internal);
+    }
+
+    /**
+     * @param factory
+     * @param qname
+     */
+    public CMISContent(Factory factory, QName qname) {
+        super(factory, qname);
+    }
+
+    /**
+     * Gets Content Media Type
+     * 
+     * @return content media type (or null, if not specified)
+     */
+    public MimeType getMediaType() {
+        MimeType type = null;
+        Element mediaType = getFirstChild(CMISConstants.CONTENT_MEDIATYPE);
+        if (mediaType != null) {
+            String mediaTypeVal = mediaType.getText();
+            if (mediaTypeVal != null) {
+                try {
+                    type = new MimeType(mediaTypeVal);
+                } catch (Exception e) {}
+            }
+        }
+        return type;
+    }
+
+    /**
+     * Gets Base64 encoded content
+     * 
+     * @return  content (base64 encoded)
+     */
+    public String getBase64() {
+        String base64Str = null;
+        Element base64 = getFirstChild(CMISConstants.CONTENT_BASE64);
+        if (base64 != null) {
+            base64Str = base64.getText();
+        }
+        return base64Str;
+    }
+    
+    /**
+     * Gets Content
+     * 
+     * @return  content (base64 decoded)
+     * @throws IOException
+     */
+    public InputStream getContentStream() throws IOException {
+        MimeType type = getMediaType();
+        String base64 = getBase64();
+        DataHandler dh = (DataHandler)DataHandlerUtils.getDataHandlerFromText(base64, (type != null) ? type.toString() : null);
+        return dh.getInputStream();
+    }
+    
+}

Propchange: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISContent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISExtensionFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISExtensionFactory.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISExtensionFactory.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISExtensionFactory.java Fri Oct  9 17:25:19 2009
@@ -25,7 +25,6 @@
 import org.apache.chemistry.abdera.ext.CMISProperty.CMISPropertyInteger;
 import org.apache.chemistry.abdera.ext.CMISProperty.CMISPropertyString;
 import org.apache.chemistry.abdera.ext.CMISProperty.CMISPropertyUri;
-import org.apache.chemistry.abdera.ext.CMISProperty.CMISPropertyXml;
 
 
 /**
@@ -38,6 +37,8 @@
         addImpl(REPOSITORY_INFO, CMISRepositoryInfo.class);
         addImpl(CAPABILITIES, CMISCapabilities.class);
         addImpl(OBJECT, CMISObject.class);
+        addImpl(CONTENT, CMISContent.class);
+        addImpl(NUM_ITEMS, CMISNumItems.class);
         addImpl(PROPERTIES, CMISProperties.class);
         addImpl(STRING_PROPERTY, CMISPropertyString.class);
         addImpl(DECIMAL_PROPERTY, CMISPropertyDecimal.class);
@@ -46,14 +47,13 @@
         addImpl(DATETIME_PROPERTY, CMISPropertyDateTime.class);
         addImpl(URI_PROPERTY, CMISPropertyUri.class);
         addImpl(ID_PROPERTY, CMISPropertyId.class);
-        addImpl(XML_PROPERTY, CMISPropertyXml.class);
         addImpl(HTML_PROPERTY, CMISPropertyHtml.class);
         addImpl(PROPERTY_VALUE, CMISValue.class);
         addImpl(ALLOWABLE_ACTIONS, CMISAllowableActions.class);
         addImpl(CAN_DELETE, CMISAllowableAction.class);
         addImpl(CAN_UPDATE_PROPERTIES, CMISAllowableAction.class);
         addImpl(CAN_GET_PROPERTIES, CMISAllowableAction.class);
-        addImpl(CAN_GET_RELATIONSHIPS, CMISAllowableAction.class);
+        addImpl(CAN_GET_OBJECT_RELATIONSHIPS, CMISAllowableAction.class);
         addImpl(CAN_GET_PARENTS, CMISAllowableAction.class);
         addImpl(CAN_GET_FOLDER_PARENT, CMISAllowableAction.class);
         addImpl(CAN_GET_DESCENDANTS, CMISAllowableAction.class);

Added: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java?rev=823626&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java Fri Oct  9 17:25:19 2009
@@ -0,0 +1,61 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Authors:
+ *     David Caruana, Alfresco
+ */
+package org.apache.chemistry.abdera.ext;
+
+import javax.xml.namespace.QName;
+
+import org.apache.abdera.factory.Factory;
+import org.apache.abdera.model.Element;
+import org.apache.abdera.model.ExtensibleElementWrapper;
+
+
+/**
+ * CMIS Number Of Items for the Abdera ATOM library.
+ */
+public class CMISNumItems extends ExtensibleElementWrapper {
+    
+    /**
+     * @param internal
+     */
+    public CMISNumItems(Element internal) {
+        super(internal);
+    }
+
+    /**
+     * @param factory
+     * @param qname
+     */
+    public CMISNumItems(Factory factory, QName qname) {
+        super(factory, qname);
+    }
+
+    /**
+     * Gets Number of Items
+     * 
+     * @return number of items (or -1 if not known)
+     */
+    public int getNumItems() {
+        int numItems = -1;
+        String numItemsStr = getText();
+        if (numItemsStr != null && numItemsStr.length() > 0) {
+            try {
+                numItems = new Integer(numItemsStr);
+            } catch(NumberFormatException e) { /* NOTE: default to unknown */ } 
+        }
+        return numItems;
+    }
+}

Propchange: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISNumItems.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISProperty.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISProperty.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISProperty.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/abdera/ext/CMISProperty.java Fri Oct  9 17:25:19 2009
@@ -371,30 +371,6 @@
     }
 
     /**
-     * XML Property
-     */
-    public static class CMISPropertyXml extends CMISPropertyString {
-        public CMISPropertyXml(Element internal) {
-            super(internal);
-        }
-
-        public CMISPropertyXml(Factory factory, QName qname) {
-            super(factory, qname);
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.apache.abdera.ext.cmis.CMISProperty.CMISPropertyString#getType()
-         */
-        @Override
-        public String getType() {
-            return CMISConstants.PROP_TYPE_XML;
-        }
-    }
-
-    /**
      * HTML Property
      */
     public static class CMISPropertyHtml extends CMISPropertyString {

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISClient.java Fri Oct  9 17:25:19 2009
@@ -30,6 +30,7 @@
 
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.abdera.model.Collection;
+import org.apache.abdera.model.Element;
 import org.apache.abdera.model.Entry;
 import org.apache.abdera.model.Feed;
 import org.apache.abdera.model.Link;
@@ -130,8 +131,8 @@
     public Collection getCMISCollection(Workspace workspace, String collectionId) {
         List<Collection> collections = workspace.getCollections();
         for (Collection collection : collections) {
-            String id = collection.getAttributeValue(CMISConstants.COLLECTION_TYPE);
-            if (id != null && id.equals(collectionId)) {
+            Element collectionType = collection.getFirstChild(CMISConstants.COLLECTION_TYPE);
+            if (collectionType != null && collectionId.equals(collectionType.getText())) {
                 return collection;
             }
         }
@@ -295,6 +296,7 @@
         Entry createEntry = appModel.parseEntry(new StringReader(createFile), null);
         MimeType mimeType = createEntry.getContentMimeType();
         boolean mediaType = (mimeType != null);
+        createFile = createFile.replace("${CMISCONTENT}", new String(Base64.encodeBase64(name.getBytes())));
         createFile = createFile.replace("${CONTENT}", mediaType ? new String(Base64.encodeBase64(name.getBytes())) : name);
         Request req = new PostRequest(parent.toString(), createFile, CMISConstants.MIMETYPE_ENTRY);
         Response res = executeRequest(req, 201, cmisValidator.getCMISAtomValidator());

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISValidator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISValidator.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISValidator.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/client/CMISValidator.java Fri Oct  9 17:25:19 2009
@@ -73,10 +73,8 @@
     public Validator getAppValidator() throws IOException, SAXException {
         if (appValidator == null) {
             SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            Source APPFile = new StreamSource(getClass().getResourceAsStream(
-                    "/org/apache/chemistry/tck/atompub/xsd/APP.xsd"), getClass().getResource(
-                    "/org/apache/chemistry/tck/atompub/xsd/APP.xsd").toExternalForm());
-            Schema schema = factory.newSchema(APPFile);
+            Source[] schemas = new Source[] { getAPPSource(), getCMISCoreSource(), getCMISRestAtomSource() };
+            Schema schema = factory.newSchema(schemas);
             appValidator = schema.newValidator();
         }
         return appValidator;
@@ -92,13 +90,10 @@
     public Validator getCMISAtomValidator() throws IOException, SAXException {
         if (atomValidator == null) {
             SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-            Source ATOMFile = new StreamSource(getClass().getResourceAsStream(
-                    "/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd"), getClass().getResource(
-                    "/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd").toExternalForm());
-            Schema schema = factory.newSchema(ATOMFile);
+            Source[] schemas = new Source[] { getATOMSource(), getCMISCoreSource(), getCMISRestAtomSource() };
+            Schema schema = factory.newSchema(schemas);
             atomValidator = schema.newValidator();
         }
-
         return atomValidator;
     }
 
@@ -119,6 +114,46 @@
     }
 
     /**
+     * @return ATOM.xsd source
+     */
+    private Source getATOMSource()
+    {
+        return new StreamSource(getClass().getResourceAsStream(
+                "/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd"), getClass().getResource(
+                "/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd").toExternalForm());
+    }
+
+    /**
+     * @return APP.xsd source
+     */
+    private Source getAPPSource()
+    {
+        return new StreamSource(getClass().getResourceAsStream(
+                "/org/apache/chemistry/tck/atompub/xsd/APP.xsd"), getClass().getResource(
+                "/org/apache/chemistry/tck/atompub/xsd/APP.xsd").toExternalForm());
+    }
+
+    /**
+     * @return CMIS-Core.xsd source
+     */
+    private Source getCMISCoreSource()
+    {
+        return new StreamSource(getClass().getResourceAsStream(
+                "/org/apache/chemistry/tck/atompub/xsd/CMIS-Core.xsd"), getClass().getResource(
+                "/org/apache/chemistry/tck/atompub/xsd/CMIS-Core.xsd").toExternalForm());
+    }
+
+    /**
+     * @return CMIS-RestAtom.xsd source
+     */
+    private Source getCMISRestAtomSource()
+    {
+        return new StreamSource(getClass().getResourceAsStream(
+                "/org/apache/chemistry/tck/atompub/xsd/CMIS-RestAtom.xsd"), getClass().getResource(
+                "/org/apache/chemistry/tck/atompub/xsd/CMIS-RestAtom.xsd").toExternalForm());
+    }
+    
+    /**
      * Convert SAX Exception to String
      * 
      * @param e

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/CreateTest.java Fri Oct  9 17:25:19 2009
@@ -48,7 +48,7 @@
         Assert.assertNotNull(entry);
     }
     
-    public void testCreateDocument()
+    public void testCreateDocumentCMISContent()
         throws Exception
     {
         Entry testFolder = fixture.getTestCaseFolder();
@@ -57,7 +57,27 @@
         Feed children = client.getFeed(childrenLink.getHref());
         Assert.assertNotNull(children);
         int entriesBefore = children.getEntries().size();
-        Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateDocument");
+        Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateDocumentCMISContent", "createdocumentBase64.cmisatomentry.xml");
+        Response documentContentRes = client.executeRequest(new GetRequest(document.getContentSrc().toString()), 200);
+        String resContent = documentContentRes.getContentAsString();
+        Assert.assertEquals(document.getTitle(), resContent);
+        Feed feedFolderAfter = client.getFeed(childrenLink.getHref());
+        int entriesAfter = feedFolderAfter.getEntries().size();
+        Assert.assertEquals(entriesBefore +1, entriesAfter);
+        Entry entry = feedFolderAfter.getEntry(document.getId().toString());
+        Assert.assertNotNull(entry);
+    }
+
+    public void testCreateDocumentAtomContent()
+        throws Exception
+    {
+        Entry testFolder = fixture.getTestCaseFolder();
+        Link childrenLink = client.getChildrenLink(testFolder);
+        Assert.assertNotNull(childrenLink);
+        Feed children = client.getFeed(childrenLink.getHref());
+        Assert.assertNotNull(children);
+        int entriesBefore = children.getEntries().size();
+        Entry document = client.createDocument(children.getSelfLink().getHref(), "testCreateDocumentAtomContent");
         Response documentContentRes = client.executeRequest(new GetRequest(document.getContentSrc().toString()), 200);
         String resContent = documentContentRes.getContentAsString();
         Assert.assertEquals(document.getTitle(), resContent);

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/TypeDefinitionTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/TypeDefinitionTest.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/TypeDefinitionTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/TypeDefinitionTest.java Fri Oct  9 17:25:19 2009
@@ -26,8 +26,6 @@
 import org.apache.abdera.model.Link;
 import org.apache.chemistry.abdera.ext.CMISConstants;
 import org.apache.chemistry.tck.atompub.TCKTest;
-import org.apache.chemistry.tck.atompub.http.GetRequest;
-import org.apache.chemistry.tck.atompub.http.Response;
 import org.junit.Assert;
 
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/java/org/apache/chemistry/tck/atompub/test/spec/UpdateTest.java Fri Oct  9 17:25:19 2009
@@ -28,6 +28,7 @@
 import org.apache.chemistry.tck.atompub.http.PutRequest;
 import org.apache.chemistry.tck.atompub.http.Request;
 import org.apache.chemistry.tck.atompub.http.Response;
+import org.apache.commons.codec.binary.Base64;
 import org.junit.Assert;
 
 
@@ -68,10 +69,44 @@
         Response contentRes = client.executeRequest(new GetRequest(updated.getContentSrc().toString()), 200);
         Assert.assertEquals("updated content " + guid, contentRes.getContentAsString());
     }
+    
+    public void testUpdatePutCMISContent() throws Exception {
+        // retrieve test folder for update
+        Entry document = fixture.createTestDocument("testUpdatePutCMISContent");
+        String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
+        if (mimetype != null) {
+            Assert.assertEquals("text/html", mimetype);
+        }
+
+        // TODO: check for content update allowable action
+        // if update allowed, perform update, else update and check for
+        // appropriate error
+
+        // update
+        String updateFile = templates.load("updatedocument.cmisatomentry.xml");
+        // FIXME: Add a decent UID generation policy
+        // String guid = GUID.generate();
+        String guid = System.currentTimeMillis() + "";
+        updateFile = updateFile.replace("${NAME}", guid);
+        updateFile = updateFile.replace("${CMISCONTENT}", new String(Base64.encodeBase64(("updated content " + guid).getBytes())));
+        Request putReq = new PutRequest(document.getSelfLink().getHref().toString(), updateFile, CMISConstants.MIMETYPE_ENTRY);
+        Response res = client.executeRequest(putReq, 200, client.getAtomValidator());
+        Assert.assertNotNull(res);
+        Entry updated = model.parseEntry(new StringReader(res.getContentAsString()), null);
+
+        // ensure update occurred
+        Assert.assertEquals(document.getId(), updated.getId());
+        Assert.assertEquals(document.getPublished(), updated.getPublished());
+        Assert.assertEquals("Updated Title " + guid, updated.getTitle());
+        // TODO: why is this testing for text/plain? it should be text/html
+        Assert.assertEquals("text/plain", updated.getContentMimeType().toString());
+        Response contentRes = client.executeRequest(new GetRequest(updated.getContentSrc().toString()), 200);
+        Assert.assertEquals("updated content " + guid, contentRes.getContentAsString());
+    }
 
-    public void testUpdatePut() throws Exception {
+    public void testUpdatePutAtomContent() throws Exception {
         // retrieve test folder for update
-        Entry document = fixture.createTestDocument("testUpdatePut");
+        Entry document = fixture.createTestDocument("testUpdatePutAtomContent");
         String mimetype = (document.getContentMimeType() != null) ? document.getContentMimeType().toString() : null;
         if (mimetype != null) {
             Assert.assertEquals("text/html", mimetype);

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocument.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <content type="text/html">${CONTENT}</content>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>cmis:document</cmis:value>
       </cmis:propertyId>
     </cmis:properties>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <content type="text/plain">
@@ -12,10 +12,10 @@
     biB0aGUgcmVwb3NpdG9yeSB3aWxsIGNyZWF0ZSB0aGUgZG9jdW1lbnQgaW4gdGhlIHNwZWNpZmll
     ZCBmb2xkZXIuICBJZiB0aGUgY29udGVudCBzdHJlYW0gaXMgc3BlY2lmaWVkIG9uIGNyZWF0ZSwg
     aXQgc2hvdWxkIGJlIGJhc2U2NCBlbmNvZGVkIGluIHRoZSBhdG9tIGVudHJ5Lg==
-    </content>
+  </content>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>cmis:document</cmis:value>
       </cmis:propertyId>
     </cmis:properties>

Added: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml?rev=823626&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml Fri Oct  9 17:25:19 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
+  <title>${NAME}</title>
+  <summary>${NAME} (summary)</summary>
+  <content type="text">Must be ignored - overridden by cmisra:content</content>
+  <cmisra:content>
+    <cmisra:mediatype>text/plain</cmisra:mediatype>
+    <cmisra:base64>${CMISCONTENT}</cmisra:base64>
+  </cmisra:content>
+  <cmisra:object>
+    <cmis:properties>
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
+        <cmis:value>cmis:document</cmis:value>
+      </cmis:propertyId>
+    </cmis:properties>
+  </cmisra:object>
+</entry>

Propchange: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentBase64.cmisatomentry.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createdocumentNoContent.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>cmis:document</cmis:value>
       </cmis:propertyId>
     </cmis:properties>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createfolder.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>cmis:folder</cmis:value>
       </cmis:propertyId>
     </cmis:properties>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createrelationship.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createrelationship.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createrelationship.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/createrelationship.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>${RELTYPE}</cmis:value>
       </cmis:propertyId>
-      <cmis:propertyId pdid="cmis:TargetId">
+      <cmis:propertyId propertyDefinitionId="cmis:targetId">
         <cmis:value>${TARGETID}</cmis:value>
       </cmis:propertyId>
     </cmis:properties>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomdocument.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomdocument.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomdocument.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomdocument.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <content type="text/html">${CONTENT}</content>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>D/cmiscustom:document</cmis:value>
       </cmis:propertyId>
-      <cmis:propertyString pdid="cmiscustom:docprop_string">
+      <cmis:propertyString propertyDefinitionId="cmiscustom:docprop_string">
         <cmis:value>custom string</cmis:value>
       </cmis:propertyString>
-      <cmis:propertyBoolean pdid="cmiscustom:docprop_boolean_multi">
+      <cmis:propertyBoolean propertyDefinitionId="cmiscustom:docprop_boolean_multi">
         <cmis:value>true</cmis:value>
         <cmis:value>false</cmis:value>
       </cmis:propertyBoolean>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomfolder.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomfolder.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomfolder.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/createcustomfolder.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>${NAME}</title>
   <summary>${NAME} (summary)</summary>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyId pdid="cmis:ObjectTypeId">
+      <cmis:propertyId propertyDefinitionId="cmis:objectTypeId">
         <cmis:value>F/cmiscustom:folder</cmis:value>
       </cmis:propertyId>
-      <cmis:propertyString pdid="cmiscustom:folderprop_string">
+      <cmis:propertyString propertyDefinitionId="cmiscustom:folderprop_string">
         <cmis:value>custom string</cmis:value>
       </cmis:propertyString>
     </cmis:properties>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/updatecustomdocument.atomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/updatecustomdocument.atomentry.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/updatecustomdocument.atomentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/custom/updatecustomdocument.atomentry.xml Fri Oct  9 17:25:19 2009
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <title>Updated Title ${NAME}</title>
   <cmisra:object>
     <cmis:properties>
-      <cmis:propertyString pdid="cmiscustom:docprop_string">
+      <cmis:propertyString propertyDefinitionId="cmiscustom:docprop_string">
         <cmis:value>custom ${NAME}</cmis:value>
       </cmis:propertyString>
-      <cmis:propertyBoolean pdid="cmiscustom:docprop_boolean_multi">
+      <cmis:propertyBoolean propertyDefinitionId="cmiscustom:docprop_boolean_multi">
         <cmis:value>false</cmis:value>
         <cmis:value>true</cmis:value>
       </cmis:propertyBoolean>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/query.cmisquery.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/query.cmisquery.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/query.cmisquery.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/query.cmisquery.xml Fri Oct  9 17:25:19 2009
@@ -1,4 +1,4 @@
-<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <cmis:statement><![CDATA[${STATEMENT}]]></cmis:statement>
   <cmis:skipCount>${SKIPCOUNT}</cmis:skipCount>
   <cmis:maxItems>${MAXITEMS}</cmis:maxItems>

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/queryallowableactions.cmisquery.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/queryallowableactions.cmisquery.xml?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/queryallowableactions.cmisquery.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/queryallowableactions.cmisquery.xml Fri Oct  9 17:25:19 2009
@@ -1,4 +1,4 @@
-<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
+<cmis:query xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200908/">
   <cmis:statement><![CDATA[${STATEMENT}]]></cmis:statement>
   <cmis:includeAllowableActions>${INCLUDEALLOWABLEACTIONS}</cmis:includeAllowableActions>
   <cmis:skipCount>${SKIPCOUNT}</cmis:skipCount>

Added: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml?rev=823626&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml Fri Oct  9 17:25:19 2009
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200908/">
+  <title>Updated Title ${NAME}</title>
+  <content>this content must be ignored ${NAME}</content>   <!--  must be overridden by cmisra:content -->
+  <cmisra:content>
+    <cmisra:mediatype>text/plain</cmisra:mediatype>
+    <cmisra:base64>${CMISCONTENT}</cmisra:base64>
+  </cmisra:content>
+</entry>

Propchange: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/templates/updatedocument.cmisatomentry.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/APP.xsd
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/APP.xsd?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/APP.xsd (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/APP.xsd Fri Oct  9 17:25:19 2009
@@ -3,18 +3,18 @@
 		-*- rnc -*- RELAX NG Compact Syntax Grammar for the Atom Format
 		Specification Version 11
 	-->
+	<!--
+		$Revision: 34 $
+		$Date: 2009-08-07 23:20:47 +0100 (Fri, 07 Aug 2009) $
+		$Author: albertcbrown $
+		$HeadURL: http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/APP.xsd $
+	-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="qualified" targetNamespace="http://www.w3.org/2007/app"
 	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:app="http://www.w3.org/2007/app"
-	xmlns:cmisc="http://docs.oasis-open.org/ns/cmis/core/200901"
-	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-	version="0.62d">
+	version="0.63">
 	<xs:import namespace="http://www.w3.org/2005/Atom"
 		schemaLocation="ATOM.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200901"
-		schemaLocation="CMIS-Core.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-		schemaLocation="CMIS-RestAtom.xsd" />
 
 	<xs:element name="service" type="app:appServiceType"></xs:element>
 	<xs:complexType name="appServiceType">

Modified: incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd?rev=823626&r1=823625&r2=823626&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-tck-atompub/src/main/resources/org/apache/chemistry/tck/atompub/xsd/ATOM.xsd Fri Oct  9 17:25:19 2009
@@ -3,20 +3,21 @@
 		-*- rnc -*- RELAX NG Compact Syntax Grammar for the Atom Format
 		Specification Version 11
 	-->
+	<!--
+		$Revision: 34 $
+		$Date: 2009-08-07 23:20:47 +0100 (Fri, 07 Aug 2009) $
+		$Author: albertcbrown $
+		$HeadURL: http://tools.oasis-open.org/version-control/svn/cmis/trunk/SchemaProject/schema/ATOM.xsd $
+	-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="qualified" targetNamespace="http://www.w3.org/2005/Atom"
 	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"
-	xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901" xmlns:xml="http://www.w3.org/XML/1998/namespace"
+	xmlns:xml="http://www.w3.org/XML/1998/namespace"
 	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
-	xmlns:cmisra="http://docs.oasis-open.org/ns/cmis/restatom/200901"
 	jaxb:extensionBindingPrefixes="xjc" jaxb:version="2.1" version="0.62d">
 
 	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
 		schemaLocation="xml.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/core/200901"
-		schemaLocation="CMIS-Core.xsd" />
-	<xs:import namespace="http://docs.oasis-open.org/ns/cmis/restatom/200901"
-		schemaLocation="CMIS-RestAtom.xsd" />
 
 	<!-- Common attributes -->
 	<xs:attributeGroup name="atomCommonAttributes">



Mime
View raw message