chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r800672 [1/3] - in /incubator/chemistry/trunk/chemistry: chemistry-api/src/main/java/org/apache/chemistry/ chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/ chemistry-atompub-client/src/main/java/org/apache/chemist...
Date Tue, 04 Aug 2009 04:26:34 GMT
Author: fguillaume
Date: Tue Aug  4 04:26:32 2009
New Revision: 800672

URL: http://svn.apache.org/viewvc?rev=800672&view=rev
Log:
CMIS-44: various updates. Refactored constants. Improve TCK coverage.

Added:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java   (with props)
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMIS.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java   (contents, props changed)
      - copied, changed from r800156, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java   (contents, props changed)
      - copied, changed from r800122, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ChangeCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java   (contents, props changed)
      - copied, changed from r798827, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/JoinCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java   (contents, props changed)
      - copied, changed from r798827, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/QueryCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java   (contents, props changed)
      - copied, changed from r799653, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RenditionCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPub.java   (contents, props changed)
      - copied, changed from r798963, incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/Atom.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/AtomPubCMIS.java   (contents, props changed)
      - copied, changed from r800161, incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
Removed:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ChangeCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/JoinCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/QueryCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RenditionCapability.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/Atom.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
Modified:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapabilityType.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Rendition.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryCapabilities.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryInfo.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPFolder.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryCapabilities.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryInfo.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractEntryReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractFeedReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ObjectEntryWriter.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/QueryWriter.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ServiceDocumentReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/ValueIterator.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISObjectsCollection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISParentsCollection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISProvider.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISQueryFeed.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISServiceResponse.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISWorkspaceManager.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/jaxrs/AbderaResource.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/ValueAdapter.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/AllowableActionsElement.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/ObjectElement.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/QueryElement.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/antlr3/org/apache/chemistry/cmissql/CmisSqlParser.g
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleContentStream.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/gunit/org/apache/chemistry/cmissql/CmisSql.testsuite
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrContentStream.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicTestCase.java

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapabilityType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapabilityType.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapabilityType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapabilityType.java Tue Aug  4 04:26:32 2009
@@ -33,7 +33,7 @@
     PermissionsSupported getSupportedPermissions();
 
     /**
-     * Gets how non-direct ACEs can be handled by the repository
+     * Gets how non-direct ACEs can be handled by the repository.
      */
     ACLPropagation getACLPropagation();
 

Added: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java?rev=800672&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java Tue Aug  4 04:26:32 2009
@@ -0,0 +1,204 @@
+/*
+ * 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:
+ *     Florent Guillaume, Nuxeo
+ */
+package org.apache.chemistry;
+
+import static org.apache.chemistry.CMIS.CMISName;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Utility class holding constants related to allowable actions.
+ */
+public class AllowableAction {
+
+    // utility class
+    private AllowableAction() {
+    }
+
+    public static final QName CAN_DELETE_OBJECT = CMISName("canDeleteObject");
+
+    public static final QName CAN_UPDATE_PROPERTIES = CMISName("canUpdateProperties");
+
+    public static final QName CAN_GET_PROPERTIES = CMISName("canGetProperties");
+
+    public static final QName CAN_GET_RELATIONSHIPS = CMISName("canGetRelationships");
+
+    public static final QName CAN_GET_OBJECT_PARENTS = CMISName("canGetObjectParents");
+
+    public static final QName CAN_GET_FOLDER_PARENT = CMISName("canGetFolderParent");
+
+    public static final QName CAN_GET_DESCENDANTS = CMISName("canGetDescendants");
+
+    public static final QName CAN_MOVE_OBJECT = CMISName("canMoveObject");
+
+    public static final QName CAN_DELETE_CONTENT_STREAM = CMISName("canDeleteContentStream");
+
+    public static final QName CAN_CHECK_OUT = CMISName("canCheckOut");
+
+    public static final QName CAN_CANCEL_CHECK_OUT = CMISName("canCancelCheckOut");
+
+    public static final QName CAN_CHECK_IN = CMISName("canCheckIn");
+
+    public static final QName CAN_SET_CONTENT_STREAM = CMISName("canSetContentStream");
+
+    public static final QName CAN_GET_ALL_VERSIONS = CMISName("canGetAllVersions");
+
+    public static final QName CAN_ADD_OBJECT_TO_FOLDER = CMISName("canAddObjectToFolder");
+
+    public static final QName CAN_REMOVE_OBJECT_FROM_FOLDER = CMISName("canRemoveObjectFromFolder");
+
+    public static final QName CAN_GET_CONTENT_STREAM = CMISName("canGetContentStream");
+
+    public static final QName CAN_APPLY_POLICY = CMISName("canApplyPolicy");
+
+    public static final QName CAN_GET_APPLIED_POLICIES = CMISName("canGetAppliedPolicies");
+
+    public static final QName CAN_REMOVE_POLICY = CMISName("canRemovePolicy");
+
+    public static final QName CAN_GET_CHILDREN = CMISName("canGetChildren");
+
+    public static final QName CAN_CREATE_DOCUMENT = CMISName("canCreateDocument");
+
+    public static final QName CAN_CREATE_FOLDER = CMISName("canCreateFolder");
+
+    public static final QName CAN_CREATE_RELATIONSHIP = CMISName("canCreateRelationship");
+
+    public static final QName CAN_CREATE_POLICY = CMISName("canCreatePolicy");
+
+    public static final QName CAN_DELETE_TREE = CMISName("canDeleteTree");
+
+    public static final QName CAN_GET_RENDITIONS = CMISName("canGetRenditions");
+
+    public static final QName CAN_GET_ACL = CMISName("canGetACL");
+
+    public static final QName CAN_APPLY_ACL = CMISName("canApplyACL");
+
+    public static List<QName> DEFAULT = Collections.unmodifiableList(Arrays.asList(
+            CAN_DELETE_OBJECT, //
+            CAN_UPDATE_PROPERTIES, //
+            CAN_GET_PROPERTIES, //
+            CAN_GET_RELATIONSHIPS, //
+            CAN_GET_OBJECT_PARENTS, //
+            CAN_GET_FOLDER_PARENT, //
+            CAN_GET_DESCENDANTS, //
+            CAN_MOVE_OBJECT, //
+            CAN_DELETE_CONTENT_STREAM, //
+            CAN_CHECK_OUT, //
+            CAN_CANCEL_CHECK_OUT, //
+            CAN_CHECK_IN, //
+            CAN_SET_CONTENT_STREAM, //
+            CAN_GET_ALL_VERSIONS, //
+            CAN_ADD_OBJECT_TO_FOLDER, //
+            CAN_REMOVE_OBJECT_FROM_FOLDER, //
+            CAN_GET_CONTENT_STREAM, //
+            CAN_APPLY_POLICY, //
+            CAN_GET_APPLIED_POLICIES, //
+            CAN_REMOVE_POLICY, //
+            CAN_GET_CHILDREN, //
+            CAN_CREATE_DOCUMENT, //
+            CAN_CREATE_FOLDER, //
+            CAN_CREATE_RELATIONSHIP, //
+            CAN_CREATE_POLICY, //
+            CAN_DELETE_TREE, //
+            CAN_GET_RENDITIONS, //
+            CAN_GET_ACL, //
+            CAN_APPLY_ACL //
+    ));
+
+    // keys for permissions mapping TODO
+
+    public static final String GET_DESCENDENTS_FOLDER = "canGetDescendents.Folder";
+
+    public static final String GET_CHILDREN_FOLDER = "canGetChildren.Folder";
+
+    public static final String GET_PARENTS_FOLDER = "canGetParents.Folder";
+
+    public static final String GET_FOLDER_PARENT_OBJECT = "canGetFolderParent.Object";
+
+    public static final String CREATE_DOCUMENT_TYPE = "canCreateDocument.Type";
+
+    public static final String CREATE_DOCUMENT_FOLDER = "canCreateDocument.Folder";
+
+    public static final String CREATE_FOLDER_TYPE = "canCreateFolder.Type";
+
+    public static final String CREATE_FOLDER_FOLDER = "canCreateFolder.Folder";
+
+    public static final String CREATE_RELATIONSHIP_TYPE = "canCreateRelationship.Type";
+
+    public static final String CREATE_RELATIONSHIP_SOURCE = "canCreateRelationship.Source";
+
+    public static final String CREATE_RELATIONSHIP_TARGET = "canCreateRelationship.Target";
+
+    public static final String CREATE_POLICY_TYPE = "canCreatePolicy.Type";
+
+    public static final String GET_PROPERTIES_OBJECT = "canGetProperties.Object";
+
+    public static final String VIEW_CONTENT_OBJECT = "canViewContent.Object";
+
+    public static final String UPDATE_PROPERTIES_OBJECT = "canUpdateProperties.Object";
+
+    public static final String MOVE_OBJECT = "canMove.Object";
+
+    public static final String MOVE_TARGET = "canMove.Target";
+
+    public static final String MOVE_SOURCE = "canMove.Source";
+
+    public static final String DELETE_OBJECT = "canDelete.Object";
+
+    public static final String DELETE_TREE_FOLDER = "canDeleteTree.Folder";
+
+    public static final String SET_CONTENT_DOCUMENT = "canSetContent.Document";
+
+    public static final String DELETE_CONTENT_DOCUMENT = "canDeleteContent.Document";
+
+    public static final String ADD_TO_FOLDER_OBJECT = "canAddToFolder.Object";
+
+    public static final String ADD_TO_FOLDER_FOLDER = "canAddToFolder.Folder";
+
+    public static final String REMOVE_FROM_FOLDER_OBJECT = "canRemoveFromFolder.Object";
+
+    public static final String REMOVE_FROM_FOLDER_FOLDER = "canRemoveFromFolder.Folder";
+
+    public static final String CHECK_OUT_DOCUMENT = "canCheckout.Document"; // TODO-0.63
+
+    public static final String CANCEL_CHECK_OUT_DOCUMENT = "canCancelCheckout.Document"; // TODO-0.63
+
+    public static final String CHECK_IN_DOCUMENT = "canCheckin.Document"; // TODO-0.63
+
+    public static final String GET_ALL_VERSIONS_VERSIONSERIES = "canGetAllVersions.VersionSeries";
+
+    public static final String GET_RELATIONSHIP_OBJECT = "canGetRelationship.Object";
+
+    public static final String ADD_POLICY_OBJECT = "canAddPolicy.Object";
+
+    public static final String ADD_POLICY_POLICY = "canAddPolicy.Policy";
+
+    public static final String REMOVE_POLICY_OBJECT = "canRemovePolicy.Object";
+
+    public static final String REMOVE_POLICY_POLICY = "canRemovePolicy.Policy";
+
+    public static final String GET_APPLIED_POLICIES_OBJECT = "canGetAppliedPolicies.Object";
+
+    public static final String GET_ACL_OBJECT = "canGetACL.Object";
+
+    public static final String APPLY_ACL_OBJECT = "canApplyACL.Object";
+
+}

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/AllowableAction.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMIS.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMIS.java?rev=800672&view=auto
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMIS.java (added)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMIS.java Tue Aug  4 04:26:32 2009
@@ -0,0 +1,236 @@
+/*
+ * 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:
+ *     Florent Guillaume, Nuxeo
+ */
+package org.apache.chemistry;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Utility class providing CMIS-related constants.
+ */
+public class CMIS {
+
+    // utility class
+    private CMIS() {
+    }
+
+    public static final String CMIS_NS_BASE = "http://docs.oasis-open.org/ns/cmis/";
+
+    public static final String CMIS_NS = CMIS_NS_BASE + "core/200901";
+
+    public static final String CMIS_PREFIX = "cmis";
+
+    public static QName CMISName(String localPart) {
+        return new QName(CMIS_NS, localPart, CMIS_PREFIX);
+    }
+
+    public static final QName REPOSITORY_ID = CMISName("repositoryId");
+
+    public static final QName REPOSITORY_NAME = CMISName("repositoryName");
+
+    public static final QName REPOSITORY_RELATIONSHIP = CMISName("repositoryRelationship");
+
+    public static final QName REPOSITORY_DESCRIPTION = CMISName("repositoryDescription");
+
+    public static final QName VENDOR_NAME = CMISName("vendorName");
+
+    public static final QName PRODUCT_NAME = CMISName("productName");
+
+    public static final QName PRODUCT_VERSION = CMISName("productVersion");
+
+    public static final QName ROOT_FOLDER_ID = CMISName("rootFolderId");
+
+    public static final QName LATEST_CHANGE_LOG_TOKEN = CMISName("latestChangeToken"); // TODO-0.63
+
+    public static final QName CAPABILITIES = CMISName("capabilities");
+
+    public static final QName CAPABILITY_MULTIFILING = CMISName("capabilityMultifiling");
+
+    public static final QName CAPABILITY_UNFILING = CMISName("capabilityUnfiling");
+
+    public static final QName CAPABILITY_VERSION_SPECIFIC_FILING = CMISName("capabilityVersionSpecificFiling");
+
+    public static final QName CAPABILITY_PWC_UPDATEABLE = CMISName("capabilityPWCUpdateable");
+
+    public static final QName CAPABILITY_PWC_SEARCHABLE = CMISName("capabilityPWCSearchable");
+
+    public static final QName CAPABILITY_ALL_VERSIONS_SEARCHABLE = CMISName("capabilityAllVersionsSearchable");
+
+    public static final QName CAPABILITY_CAN_GET_DESCENDANTS = CMISName("capabilityGetDescendants");
+
+    public static final QName CAPABILITY_CONTENT_STREAM_UPDATABILITY = CMISName("capabilityContentStreamUpdatability");
+
+    public static final QName CAPABILITY_QUERY = CMISName("capabilityQuery");
+
+    public static final QName CAPABILITY_JOIN = CMISName("capabilityJoin");
+
+    public static final QName CAPABILITY_RENDITIONS = CMISName("capabilityRenditions");
+
+    public static final QName CAPABILITY_CHANGES = CMISName("capabilityChanges");
+
+    public static final QName CAPABILITY_CHANGES_ON_TYPE = CMISName("capabilityChangesOnType");
+
+    public static final QName CAPABILITY_ACL = CMISName("capabilityACL");
+
+    public static final QName CHANGES_INCOMPLETE = CMISName("changesIncomplete");
+
+    public static final QName ACL_CAPABILITY = CMISName("aclCapability");
+
+    public static final QName SET_TYPE = CMISName("setType");
+
+    public static final QName PERMISSIONS = CMISName("permissions");
+
+    public static final QName MAPPING = CMISName("mapping");
+
+    public static final QName KEY = CMISName("key");
+
+    public static final QName PERMISSION = CMISName("permission");
+
+    public static final QName VERSION_SUPPORTED = CMISName("cmisVersionSupported");
+
+    public static final QName THIN_CLIENT_URI = CMISName("thinClientURI");
+
+    public static final QName REPOSITORY_SPECIFIC_INFORMATION = CMISName("repositorySpecificInformation");
+
+    public static final QName DOCUMENT_TYPE = CMISName("documentType");
+
+    public static final QName FOLDER_TYPE = CMISName("folderType");
+
+    public static final QName RELATIONSHIP_TYPE = CMISName("relationshipType");
+
+    public static final QName POLICY_TYPE = CMISName("policyType");
+
+    public static final QName BASE_TYPE_ID = CMISName("baseTypeId");
+
+    public static final QName ID = CMISName("id");
+
+    public static final QName LOCAL_NAME = CMISName("localName");
+
+    public static final QName LOCAL_NAMESPACE = CMISName("localNamespace");
+
+    public static final QName QUERY_NAME = CMISName("queryName");
+
+    public static final QName DISPLAY_NAME = CMISName("displayName");
+
+    public static final QName PARENT_ID = CMISName("parentId");
+
+    public static final QName DESCRIPTION = CMISName("description");
+
+    public static final QName CREATABLE = CMISName("creatable");
+
+    public static final QName FILEABLE = CMISName("fileable");
+
+    public static final QName QUERYABLE = CMISName("queryable");
+
+    public static final QName CONTROLLABLE_POLICY = CMISName("controllablePolicy");
+
+    public static final QName CONTROLLABLE_ACL = CMISName("controllableACL");
+
+    public static final QName FULLTEXT_INDEXED = CMISName("fulltextindexed");
+
+    public static final QName VERSIONABLE = CMISName("versionable");
+
+    public static final QName CONTENT_STREAM_ALLOWED = CMISName("contentStreamAllowed");
+
+    public static final QName INCLUDED_IN_SUPERTYPE_QUERY = CMISName("includedInSupertypeQuery");
+
+    public static final QName PROPERTY_STRING_DEFINITION = CMISName("propertyStringDefinition");
+
+    public static final QName PROPERTY_DECIMAL_DEFINITION = CMISName("propertyDecimalDefinition");
+
+    public static final QName PROPERTY_INTEGER_DEFINITION = CMISName("propertyIntegerDefinition");
+
+    public static final QName PROPERTY_BOOLEAN_DEFINITION = CMISName("propertyBooleanDefinition");
+
+    public static final QName PROPERTY_DATETIME_DEFINITION = CMISName("propertyDateTimeDefinition");
+
+    public static final QName PROPERTY_URI_DEFINITION = CMISName("propertyUriDefinition");
+
+    public static final QName PROPERTY_ID_DEFINITION = CMISName("propertyIdDefinition");
+
+    public static final QName PROPERTY_XML_DEFINITION = CMISName("propertyXmlDefinition");
+
+    public static final QName PROPERTY_HTML_DEFINITION = CMISName("propertyHtmlDefinition");
+
+    public static final QName PROPERTY_XHTML_DEFINITION = CMISName("propertyXhtmlDefinition");
+
+    public static final QName PROPERTY_TYPE = CMISName("propertyType");
+
+    public static final QName CARDINALITY = CMISName("cardinality");
+
+    public static final QName UPDATABILITY = CMISName("updatability");
+
+    public static final QName INHERITED = CMISName("inherited");
+
+    public static final QName REQUIRED = CMISName("required");
+
+    public static final QName ORDERABLE = CMISName("orderable");
+
+    public static final QName DEFAULT_VALUE = CMISName("defaultValue");
+
+    public static final QName PROPERTIES = CMISName("properties");
+
+    public static final QName PROPERTY_STRING = CMISName("propertyString");
+
+    public static final QName PROPERTY_DECIMAL = CMISName("propertyDecimal");
+
+    public static final QName PROPERTY_INTEGER = CMISName("propertyInteger");
+
+    public static final QName PROPERTY_BOOLEAN = CMISName("propertyBoolean");
+
+    public static final QName PROPERTY_DATETIME = CMISName("propertyDateTime");
+
+    public static final QName PROPERTY_URI = CMISName("propertyUri");
+
+    public static final QName PROPERTY_ID = CMISName("propertyId");
+
+    public static final QName PROPERTY_XML = CMISName("propertyXml");
+
+    public static final QName PROPERTY_HTML = CMISName("propertyHtml");
+
+    public static final QName PROPERTY_XHTML = CMISName("propertyXhtml");
+
+    public static final QName VALUE = CMISName("value");
+
+    public static final QName ALLOWABLE_ACTIONS = CMISName("allowableActions");
+
+    public static final QName CHANGE_EVENT_INFO = CMISName("changeEventInfo");
+
+    public static final QName CHANGE_TYPE = CMISName("changeType");
+
+    public static final QName CHANGE_TIME = CMISName("changeTime");
+
+    public static final QName QUERY = CMISName("query");
+
+    public static final QName STATEMENT = CMISName("statement");
+
+    public static final QName SEARCH_ALL_VERSIONS = CMISName("searchAllVersions");
+
+    public static final QName MAX_ITEMS = CMISName("maxItems");
+
+    public static final QName SKIP_COUNT = CMISName("skipCount");
+
+    public static final QName INCLUDE_ALLOWABLE_ACTIONS = CMISName("includeAllowableActions");
+
+    // no namespace for attributes
+
+    public static final QName PDID = new QName("pdid");
+
+    public static final QName LOCALNAME = new QName("localname");
+
+    public static final QName DISPLAYNAME = new QName("displayname");
+
+}

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java Tue Aug  4 04:26:32 2009
@@ -344,7 +344,7 @@
 
     String getVersionSeriesCheckedOutId();
 
-    String getCheckinComment();
+    String getCheckInComment();
 
     /*
      * ----- convenience methods for specific properties (setter) -----

Copied: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java (from r800156, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapability.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java?p2=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java&p1=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapability.java&r1=800156&r2=800672&rev=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ACLCapability.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java Tue Aug  4 04:26:32 2009
@@ -24,7 +24,7 @@
  *
  * @see RepositoryCapabilities#getACLCapability
  */
-public enum ACLCapability {
+public enum CapabilityACL {
 
     /**
      * The repository does not support ACL services.
@@ -49,27 +49,27 @@
 
     private final String value;
 
-    private ACLCapability(String value) {
+    private CapabilityACL(String value) {
         this.value = value;
     }
 
-    private static final Map<String, ACLCapability> all = new HashMap<String, ACLCapability>();
+    private static final Map<String, CapabilityACL> all = new HashMap<String, CapabilityACL>();
     static {
-        for (ACLCapability o : values()) {
+        for (CapabilityACL o : values()) {
             all.put(o.value, o);
         }
     }
 
-    public static ACLCapability get(String value) {
-        ACLCapability o = all.get(value);
+    public static CapabilityACL get(String value) {
+        CapabilityACL o = all.get(value);
         if (o == null) {
             throw new IllegalArgumentException(value);
         }
         return o;
     }
 
-    public static ACLCapability get(String value, ACLCapability def) {
-        ACLCapability o = all.get(value);
+    public static CapabilityACL get(String value, CapabilityACL def) {
+        CapabilityACL o = all.get(value);
         if (o == null) {
             o = def;
         }

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityACL.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java (from r800122, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ChangeCapability.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java?p2=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java&p1=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ChangeCapability.java&r1=800122&r2=800672&rev=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ChangeCapability.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java Tue Aug  4 04:26:32 2009
@@ -25,7 +25,7 @@
  *
  * @see SPI#getChangeLog
  */
-public enum ChangeCapability {
+public enum CapabilityChange {
 
     /**
      * The repository does not expose any information in the change log.
@@ -47,27 +47,27 @@
 
     private final String value;
 
-    private ChangeCapability(String value) {
+    private CapabilityChange(String value) {
         this.value = value;
     }
 
-    private static final Map<String, ChangeCapability> all = new HashMap<String, ChangeCapability>();
+    private static final Map<String, CapabilityChange> all = new HashMap<String, CapabilityChange>();
     static {
-        for (ChangeCapability o : values()) {
+        for (CapabilityChange o : values()) {
             all.put(o.value, o);
         }
     }
 
-    public static ChangeCapability get(String value) {
-        ChangeCapability o = all.get(value);
+    public static CapabilityChange get(String value) {
+        CapabilityChange o = all.get(value);
         if (o == null) {
             throw new IllegalArgumentException(value);
         }
         return o;
     }
 
-    public static ChangeCapability get(String value, ChangeCapability def) {
-        ChangeCapability o = all.get(value);
+    public static CapabilityChange get(String value, CapabilityChange def) {
+        CapabilityChange o = all.get(value);
         if (o == null) {
             o = def;
         }

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityChange.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java (from r798827, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/JoinCapability.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java?p2=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java&p1=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/JoinCapability.java&r1=798827&r2=800672&rev=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/JoinCapability.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java Tue Aug  4 04:26:32 2009
@@ -22,7 +22,7 @@
 /**
  * Support for inner and outer join in query.
  */
-public enum JoinCapability {
+public enum CapabilityJoin {
 
     /**
      * No join support.
@@ -41,27 +41,27 @@
 
     private final String value;
 
-    private JoinCapability(String value) {
+    private CapabilityJoin(String value) {
         this.value = value;
     }
 
-    private static final Map<String, JoinCapability> all = new HashMap<String, JoinCapability>();
+    private static final Map<String, CapabilityJoin> all = new HashMap<String, CapabilityJoin>();
     static {
-        for (JoinCapability o : values()) {
+        for (CapabilityJoin o : values()) {
             all.put(o.value, o);
         }
     }
 
-    public static JoinCapability get(String value) {
-        JoinCapability o = all.get(value);
+    public static CapabilityJoin get(String value) {
+        CapabilityJoin o = all.get(value);
         if (o == null) {
             throw new IllegalArgumentException(value);
         }
         return o;
     }
 
-    public static JoinCapability get(String value, JoinCapability def) {
-        JoinCapability o = all.get(value);
+    public static CapabilityJoin get(String value, CapabilityJoin def) {
+        CapabilityJoin o = all.get(value);
         if (o == null) {
             o = def;
         }

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityJoin.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Copied: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java (from r798827, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/QueryCapability.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java?p2=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java&p1=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/QueryCapability.java&r1=798827&r2=800672&rev=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/QueryCapability.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java Tue Aug  4 04:26:32 2009
@@ -22,7 +22,7 @@
 /**
  * Support for query on full-text or metadata.
  */
-public enum QueryCapability {
+public enum CapabilityQuery {
 
     /**
      * No query support.
@@ -51,27 +51,27 @@
 
     private final String value;
 
-    private QueryCapability(String value) {
+    private CapabilityQuery(String value) {
         this.value = value;
     }
 
-    private static final Map<String, QueryCapability> all = new HashMap<String, QueryCapability>();
+    private static final Map<String, CapabilityQuery> all = new HashMap<String, CapabilityQuery>();
     static {
-        for (QueryCapability o : values()) {
+        for (CapabilityQuery o : values()) {
             all.put(o.value, o);
         }
     }
 
-    public static QueryCapability get(String value) {
-        QueryCapability o = all.get(value);
+    public static CapabilityQuery get(String value) {
+        CapabilityQuery o = all.get(value);
         if (o == null) {
             throw new IllegalArgumentException(value);
         }
         return o;
     }
 
-    public static QueryCapability get(String value, QueryCapability def) {
-        QueryCapability o = all.get(value);
+    public static CapabilityQuery get(String value, CapabilityQuery def) {
+        CapabilityQuery o = all.get(value);
         if (o == null) {
             o = def;
         }

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityQuery.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev Url

Copied: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java (from r799653, incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RenditionCapability.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java?p2=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java&p1=incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RenditionCapability.java&r1=799653&r2=800672&rev=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RenditionCapability.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java Tue Aug  4 04:26:32 2009
@@ -22,7 +22,7 @@
 /**
  * Support for renditions.
  */
-public enum RenditionCapability {
+public enum CapabilityRendition {
 
     /**
      * The repository does not expose renditions at all.
@@ -36,27 +36,27 @@
 
     private final String value;
 
-    private RenditionCapability(String value) {
+    private CapabilityRendition(String value) {
         this.value = value;
     }
 
-    private static final Map<String, RenditionCapability> all = new HashMap<String, RenditionCapability>();
+    private static final Map<String, CapabilityRendition> all = new HashMap<String, CapabilityRendition>();
     static {
-        for (RenditionCapability o : values()) {
+        for (CapabilityRendition o : values()) {
             all.put(o.value, o);
         }
     }
 
-    public static RenditionCapability get(String value) {
-        RenditionCapability o = all.get(value);
+    public static CapabilityRendition get(String value) {
+        CapabilityRendition o = all.get(value);
         if (o == null) {
             throw new IllegalArgumentException(value);
         }
         return o;
     }
 
-    public static RenditionCapability get(String value, RenditionCapability def) {
-        RenditionCapability o = all.get(value);
+    public static CapabilityRendition get(String value, CapabilityRendition def) {
+        CapabilityRendition o = all.get(value);
         if (o == null) {
             o = def;
         }

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CapabilityRendition.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ContentStream.java Tue Aug  4 04:26:32 2009
@@ -37,7 +37,7 @@
     /**
      * The content stream file name, or {@code null} if none is provided.
      */
-    String getFilename();
+    String getFileName();
 
     /**
      * The actual byte stream for this content stream.

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java Tue Aug  4 04:26:32 2009
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 /**
  * A CMIS object entry, returned from a search or a listing.
  * <p>
@@ -95,7 +97,7 @@
     /**
      * The allowable actions, if fetched.
      */
-    Collection<String> getAllowableActions();
+    Map<QName, Boolean> getAllowableActions();
 
     /**
      * The relationships in relation to this document, if fetched.

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Property.java Tue Aug  4 04:26:32 2009
@@ -67,13 +67,13 @@
 
     String VERSION_SERIES_CHECKED_OUT_ID = "cmis:VersionSeriesCheckedOutId";
 
-    String CHECKIN_COMMENT = "cmis:CheckinComment";
+    String CHECK_IN_COMMENT = "cmis:CheckinComment"; // TODO-0.63
 
     String CONTENT_STREAM_LENGTH = "cmis:ContentStreamLength";
 
     String CONTENT_STREAM_MIME_TYPE = "cmis:ContentStreamMimeType";
 
-    String CONTENT_STREAM_FILENAME = "cmis:ContentStreamFilename";
+    String CONTENT_STREAM_FILE_NAME = "cmis:ContentStreamFileName";
 
     String CONTENT_STREAM_ID = "cmis:ContentStreamId";
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Rendition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Rendition.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Rendition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Rendition.java Tue Aug  4 04:26:32 2009
@@ -32,6 +32,19 @@
  */
 public interface Rendition {
 
+    /**
+     * The rendition filter specifying all renditions.
+     */
+    String FILTER_ALL = "*";
+
+    /**
+     * The rendition filter specifying no rendition.
+     */
+    String FILTER_NONE = "cmis:none";
+
+    /**
+     * The thumbnail rendition kind.
+     */
     String KIND_THUMBNAIL = "cmis:thumbnail";
 
     /**

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryCapabilities.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryCapabilities.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryCapabilities.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryCapabilities.java Tue Aug  4 04:26:32 2009
@@ -70,26 +70,26 @@
     /**
      * Support for query on full-text or metadata.
      */
-    QueryCapability getQueryCapability();
+    CapabilityQuery getQueryCapability();
 
     /**
      * Support for inner and outer join in query.
      */
-    JoinCapability getJoinCapability();
+    CapabilityJoin getJoinCapability();
 
     /**
      * Support for renditions.
      */
-    RenditionCapability getRenditionCapability();
+    CapabilityRendition getRenditionCapability();
 
     /**
      * Support for change log.
      */
-    ChangeCapability getChangeCapability();
+    CapabilityChange getChangeCapability();
 
     /**
      * The level of support for ACLs.
      */
-    ACLCapability getACLCapability();
+    CapabilityACL getACLCapability();
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryEntry.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryEntry.java Tue Aug  4 04:26:32 2009
@@ -36,11 +36,6 @@
     String getName();
 
     /**
-     * The repository URI.
-     */
-    URI getURI();
-
-    /**
      * The relationship name to another repository.
      * <p>
      * This returns a value only when this basic info was returned by
@@ -50,4 +45,12 @@
      */
     String getRelationshipName();
 
+    /**
+     * An optional repository-specific URI pointing to the repository's web
+     * interface.
+     *
+     * @return an URI, or {@code null}
+     */
+    URI getThinClientURI();
+
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryInfo.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryInfo.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryInfo.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/RepositoryInfo.java Tue Aug  4 04:26:32 2009
@@ -70,7 +70,7 @@
      * The type of ACL capabilities of the repository.
      * <p>
      * Available only if {@link RepositoryCapabilities#getACLCapability} is not
-     * {@link ACLCapability#NONE}.
+     * {@link CapabilityACL#NONE}.
      */
     ACLCapabilityType getACLCapabilityType();
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java Tue Aug  4 04:26:32 2009
@@ -170,13 +170,9 @@
      *
      * @param folder the folder
      * @param filter the properties filter, or {@code null} for all properties
-     * @param includeAllowableActions {@code true} to include allowable actions
-     * @param includeRelationships {@code true} if relationships should be
-     *            included as well
      * @return the parents and optionally relationships
      */
-    ObjectEntry getFolderParent(ObjectId folder, String filter,
-            boolean includeAllowableActions, boolean includeRelationships);
+    ObjectEntry getFolderParent(ObjectId folder, String filter);
 
     /**
      * Gets the direct parents of an object.
@@ -187,13 +183,9 @@
      *
      * @param object the object
      * @param filter the properties filter, or {@code null} for all properties
-     * @param includeAllowableActions {@code true} to include allowable actions
-     * @param includeRelationships {@code true} if relationships should be
-     *            included as well
      * @return the collection of parent folders
      */
-    Collection<ObjectEntry> getObjectParents(ObjectId object, String filter,
-            boolean includeAllowableActions, boolean includeRelationships);
+    Collection<ObjectEntry> getObjectParents(ObjectId object, String filter);
 
     /**
      * Gets the list of documents that are checked out that the user has access
@@ -230,8 +222,7 @@
     /**
      * Creates a document.
      * <p>
-     * Creates a document of the specified type, and optionally adds the
-     * document to a folder.
+     * Creates a document, and optionally adds it to a folder.
      * <p>
      * The versioningState input is used to create a document in a
      * {@link VersioningState#CHECKED_OUT CHECKED_OUT} state, or as a checked-in
@@ -240,44 +231,35 @@
      * {@link VersioningState#CHECKED_OUT CHECKED_OUT} state, the object is a
      * private working copy and there is no corresponding checked out document.
      *
-     * @param typeId the document type ID
      * @param properties the properties
      * @param folder the containing folder, or {@code null}
      * @param contentStream the content stream, or {@code null}
      * @param versioningState the versioning state
+     *
      * @return the ID of the created document
      */
-    ObjectId createDocument(String typeId,
-            Map<String, Serializable> properties, ObjectId folder,
-            ContentStream contentStream, VersioningState versioningState);
+    ObjectId createDocument(Map<String, Serializable> properties,
+            ObjectId folder, ContentStream contentStream,
+            VersioningState versioningState);
 
     /**
      * Creates a folder.
-     * <p>
-     * Creates a folder object of the specified type.
      *
-     * @param typeId the folder type ID
      * @param properties the properties
      * @param folder the containing folder
+     *
      * @return the ID of the created folder
      */
-    ObjectId createFolder(String typeId, Map<String, Serializable> properties,
-            ObjectId folder);
+    ObjectId createFolder(Map<String, Serializable> properties, ObjectId folder);
 
     /**
      * Creates a relationship.
-     * <p>
-     * Creates a relationship of the specified type.
      *
-     * @param typeId the relationship type ID
      * @param properties the properties
-     * @param source the source
-     * @param target the target
+     *
      * @return the ID of the created relationship
      */
-    ObjectId createRelationship(String typeId,
-            Map<String, Serializable> properties, ObjectId source,
-            ObjectId target);
+    ObjectId createRelationship(Map<String, Serializable> properties);
 
     /**
      * Creates a policy.
@@ -285,13 +267,12 @@
      * Creates a policy of the specified type, and optionally adds the policy to
      * a folder.
      *
-     * @param typeId the relationship type ID
      * @param properties the properties
      * @param folder the containing folder, or {@code null}
+     *
      * @return the ID of the created policy
      */
-    ObjectId createPolicy(String typeId, Map<String, Serializable> properties,
-            ObjectId folder);
+    ObjectId createPolicy(Map<String, Serializable> properties, ObjectId folder);
 
     /**
      * Gets the allowable actions.
@@ -334,10 +315,11 @@
     /**
      * Gets the list of associated renditions for an object.
      * <p>
-     * A rendition filter can be included. It is either {@code "*"}, {@code
-     * "cmis:none"}, or a comma-separated list of either kinds of MIME types
-     * (which may have a subtype of {@code "*"}). The {@code null} value is
-     * equivalent to {@code "cmis:none"}.
+     * A rendition filter can be included. It is either {@code "*"} (
+     * {@link Rendition#FILTER_ALL}), {@code "cmis:none"} (
+     * {@link Rendition#FILTER_NONE}), or a comma-separated list of either kinds
+     * of MIME types (which may have a subtype of {@code "*"}). The {@code null}
+     * value is equivalent to {@code "cmis:none"}.
      *
      * @param object the object
      * @param filter a rendition filter, or {@code null} for none
@@ -347,6 +329,9 @@
      * @return the list of renditions
      *
      * @throws UnsupportedOperationException if renditions are not supported
+     *
+     * @see Rendition#FILTER_ALL
+     * @see Rendition#FILTER_NONE
      */
     List<Rendition> getRenditions(ObjectId object, String filter, int maxItems,
             int skipCount);

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java Tue Aug  4 04:26:32 2009
@@ -50,8 +50,8 @@
 import org.apache.chemistry.Type;
 import org.apache.chemistry.Unfiling;
 import org.apache.chemistry.VersioningState;
-import org.apache.chemistry.atompub.Atom;
-import org.apache.chemistry.atompub.CMIS;
+import org.apache.chemistry.atompub.AtomPub;
+import org.apache.chemistry.atompub.AtomPubCMIS;
 import org.apache.chemistry.atompub.URITemplate;
 import org.apache.chemistry.atompub.client.connector.Connector;
 import org.apache.chemistry.atompub.client.connector.Request;
@@ -125,7 +125,7 @@
         }
         APPObjectEntry entry = newObjectEntry(typeId);
         if (folder != null) {
-            entry.addLink(Atom.LINK_UP,
+            entry.addLink(AtomPub.LINK_UP,
                     ((APPFolder) folder).entry.getEditLink());
         }
         return new APPDocument(entry, type);
@@ -139,7 +139,7 @@
         APPObjectEntry entry = newObjectEntry(typeId);
         if (folder != null) {
             entry._setValue(Property.PARENT_ID, folder.getId());
-            entry.addLink(Atom.LINK_UP,
+            entry.addLink(AtomPub.LINK_UP,
                     ((APPFolder) folder).entry.getEditLink());
         }
         return new APPFolder(entry, type);
@@ -249,7 +249,7 @@
             skipCount = 0;
         }
 
-        String href = getObjectEntry(folder).getLink(Atom.LINK_DOWN);
+        String href = getObjectEntry(folder).getLink(AtomPub.LINK_DOWN);
         Response resp = connector.get(new Request(href));
         if (!resp.isOk()) {
             throw new ContentManagerException(
@@ -282,9 +282,8 @@
         return result;
     }
 
-    public ObjectEntry getFolderParent(ObjectId folder, String filter,
-            boolean includeAllowableActions, boolean includeRelationships) {
-        // TODO filter, includeRelationship, includeAllowableActions
+    public ObjectEntry getFolderParent(ObjectId folder, String filter) {
+        // TODO filter
         APPObjectEntry current = getObjectEntry(folder);
         if (!current.getBaseType().equals(BaseType.FOLDER)) {
             throw new IllegalArgumentException("Not a folder: " + folder);
@@ -293,7 +292,7 @@
         if (current.getId().equals(rootId)) {
             return null;
         }
-        String href = current.getLink(Atom.LINK_UP);
+        String href = current.getLink(AtomPub.LINK_UP);
         if (href == null) {
             return null;
         }
@@ -307,11 +306,10 @@
     }
 
     public Collection<ObjectEntry> getObjectParents(ObjectId object,
-            String filter, boolean includeAllowableActions,
-            boolean includeRelationships) {
-        // TODO filter, includeRelationship, includeAllowableActions
+            String filter) {
+        // TODO filter
         APPObjectEntry current = getObjectEntry(object);
-        String href = current.getLink(Atom.LINK_UP);
+        String href = current.getLink(AtomPub.LINK_UP);
         Response resp = connector.get(new Request(href));
         if (!resp.isOk()) {
             throw new ContentManagerException(
@@ -341,7 +339,7 @@
             return ((APPObjectEntry) objectId);
         }
         String href;
-        URITemplate uriTemplate = repository.getURITemplate(CMIS.URITMPL_ENTRY_BY_ID);
+        URITemplate uriTemplate = repository.getURITemplate(AtomPubCMIS.URITMPL_ENTRY_BY_ID);
         if (uriTemplate != null) {
             // use entry-by-id URI template
             href = uriTemplate.template;
@@ -351,7 +349,7 @@
             // TODO do a search (maybe 4 searches as base type unknown)
 
             // XXX hardcoded Chemistry URL pattern
-            href = repository.getCollectionHref(CMIS.COL_ROOT_CHILDREN);
+            href = repository.getCollectionHref(AtomPubCMIS.COL_ROOT_CHILDREN);
             if (href.matches(".*/children/[0-9a-f-]{36}")) {
                 href = href.substring(0, href.length() - "/children/".length()
                         - 36);
@@ -391,28 +389,26 @@
         }
     }
 
-    public ObjectId createDocument(String typeId,
-            Map<String, Serializable> properties, ObjectId folder,
-            ContentStream contentStream, VersioningState versioningState) {
+    public ObjectId createDocument(Map<String, Serializable> properties,
+            ObjectId folder, ContentStream contentStream,
+            VersioningState versioningState) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
-    public ObjectId createFolder(String typeId,
-            Map<String, Serializable> properties, ObjectId folder) {
+    public ObjectId createFolder(Map<String, Serializable> properties,
+            ObjectId folder) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
-    public ObjectId createRelationship(String typeId,
-            Map<String, Serializable> properties, ObjectId source,
-            ObjectId target) {
+    public ObjectId createRelationship(Map<String, Serializable> properties) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
 
-    public ObjectId createPolicy(String typeId,
-            Map<String, Serializable> properties, ObjectId folder) {
+    public ObjectId createPolicy(Map<String, Serializable> properties,
+            ObjectId folder) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }
@@ -496,7 +492,7 @@
             boolean searchAllVersions, boolean includeAllowableActions,
             boolean includeRelationships, boolean includeRenditions,
             int maxItems, int skipCount, boolean[] hasMoreItems) {
-        String href = repository.getCollectionHref(CMIS.COL_QUERY);
+        String href = repository.getCollectionHref(AtomPubCMIS.COL_QUERY);
         Response resp = connector.postQuery(new Request(href), statement,
                 searchAllVersions, maxItems, skipCount, includeAllowableActions);
         if (!resp.isOk()) {

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPDocument.java Tue Aug  4 04:26:32 2009
@@ -28,7 +28,7 @@
 import org.apache.chemistry.Document;
 import org.apache.chemistry.Property;
 import org.apache.chemistry.Type;
-import org.apache.chemistry.atompub.Atom;
+import org.apache.chemistry.atompub.AtomPub;
 import org.apache.chemistry.atompub.client.connector.Connector;
 import org.apache.chemistry.atompub.client.connector.Request;
 import org.apache.chemistry.atompub.client.connector.Response;
@@ -54,7 +54,7 @@
     }
 
     public ContentStream getContentStream() {
-        String url = entry.getLink(Atom.LINK_EDIT_MEDIA);
+        String url = entry.getLink(AtomPub.LINK_EDIT_MEDIA);
         return url == null ? null : new APPContentStream(url);
     }
 
@@ -87,9 +87,9 @@
             return mimeType;
         }
 
-        public String getFilename() {
+        public String getFileName() {
             if (filename == UNINITIALIZED_STRING) {
-                filename = getString(Property.CONTENT_STREAM_FILENAME);
+                filename = getString(Property.CONTENT_STREAM_FILE_NAME);
             }
             return filename;
         }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPFolder.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPFolder.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPFolder.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPFolder.java Tue Aug  4 04:26:32 2009
@@ -27,7 +27,7 @@
 import org.apache.chemistry.ObjectId;
 import org.apache.chemistry.Type;
 import org.apache.chemistry.Unfiling;
-import org.apache.chemistry.atompub.Atom;
+import org.apache.chemistry.atompub.AtomPub;
 import org.apache.chemistry.atompub.client.connector.Request;
 import org.apache.chemistry.atompub.client.connector.Response;
 import org.apache.chemistry.atompub.client.stax.ReadContext;
@@ -57,7 +57,7 @@
     }
 
     public List<CMISObject> getChildren() {
-        String href = entry.getLink(Atom.LINK_DOWN);
+        String href = entry.getLink(AtomPub.LINK_DOWN);
         Response resp = entry.connection.getConnector().get(new Request(href));
         if (!resp.isOk()) {
             throw new ContentManagerException(

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java Tue Aug  4 04:26:32 2009
@@ -31,7 +31,7 @@
 import org.apache.chemistry.Relationship;
 import org.apache.chemistry.RelationshipDirection;
 import org.apache.chemistry.Type;
-import org.apache.chemistry.atompub.Atom;
+import org.apache.chemistry.atompub.AtomPub;
 import org.apache.chemistry.atompub.client.connector.Connector;
 import org.apache.chemistry.atompub.client.connector.Request;
 import org.apache.chemistry.atompub.client.connector.Response;
@@ -102,7 +102,7 @@
      */
 
     public Folder getParent() {
-        String href = entry.getLink(Atom.LINK_UP); // usually a feed entry
+        String href = entry.getLink(AtomPub.LINK_UP); // usually a feed entry
         if (href == null) {
             return null;
         }
@@ -211,7 +211,7 @@
         ReadContext ctx = new ReadContext(entry.connection);
 
         // this link value is local, set by APPConnection#newDocument
-        String href = entry.getLink(Atom.LINK_UP);
+        String href = entry.getLink(AtomPub.LINK_UP);
         if (href == null) {
             throw new IllegalArgumentException(
                     "Cannot create entry: no 'cmis-parents' link is present");
@@ -219,7 +219,7 @@
         // TODO hardcoded Chemistry URL pattern here...
         href = href.replaceAll("/object/([0-9a-f-]{36}$)", "/children/$1");
         Request req = new Request(href);
-        req.setHeader("Content-Type", Atom.MEDIA_TYPE_ATOM_ENTRY);
+        req.setHeader("Content-Type", AtomPub.MEDIA_TYPE_ATOM_ENTRY);
         Response resp = connector.postObject(req, entry);
         if (resp.getStatusCode() != 201) { // Created
             throw new ContentManagerException(
@@ -254,7 +254,7 @@
                     "Cannot edit entry: no 'edit' link is present");
         }
         Request req = new Request(href);
-        req.setHeader("Content-Type", Atom.MEDIA_TYPE_ATOM_ENTRY);
+        req.setHeader("Content-Type", AtomPub.MEDIA_TYPE_ATOM_ENTRY);
         Response resp = entry.connection.getConnector().putObject(req, entry);
         if (!resp.isOk()) {
             throw new ContentManagerException(

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java Tue Aug  4 04:26:32 2009
@@ -21,19 +21,21 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
 
+import javax.xml.namespace.QName;
+
 import org.apache.chemistry.BaseType;
+import org.apache.chemistry.CMIS;
 import org.apache.chemistry.ChangeInfo;
 import org.apache.chemistry.ObjectEntry;
 import org.apache.chemistry.Property;
 import org.apache.chemistry.PropertyDefinition;
-import org.apache.chemistry.atompub.CMIS;
+import org.apache.chemistry.atompub.AtomPubCMIS;
 import org.apache.chemistry.atompub.ValueAdapter;
 import org.apache.chemistry.atompub.client.stax.XmlProperty;
 import org.apache.chemistry.xml.stax.XMLWriter;
@@ -47,16 +49,19 @@
 
     protected Map<String, XmlProperty> properties;
 
-    protected Set<String> allowableActions; // TODO use set?
+    protected Map<QName, Boolean> allowableActions;
 
     protected final List<String> links;
 
     public APPObjectEntry(APPConnection connection,
-            Map<String, XmlProperty> properties, Set<String> allowableActions) {
+            Map<String, XmlProperty> properties,
+            Map<QName, Boolean> allowableActions) {
         this.connection = connection;
         this.properties = properties;
         if (allowableActions == null) {
-            allowableActions = new HashSet<String>();
+            allowableActions = Collections.emptyMap();
+        } else {
+            allowableActions = Collections.unmodifiableMap(allowableActions);
         }
         this.allowableActions = allowableActions;
         links = new ArrayList<String>();
@@ -192,7 +197,7 @@
     // return null;
     // }
 
-    public Collection<String> getAllowableActions() {
+    public Map<QName, Boolean> getAllowableActions() {
         return allowableActions;
     }
 
@@ -207,7 +212,7 @@
     }
 
     public void writeObjectTo(XMLWriter xw) throws IOException {
-        xw.element(CMIS.RESTATOM_OBJECT);
+        xw.element(AtomPubCMIS.OBJECT);
         xw.start();
         xw.element(CMIS.PROPERTIES);
         xw.start();

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java Tue Aug  4 04:26:32 2009
@@ -17,12 +17,15 @@
  */
 package org.apache.chemistry.atompub.client;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
+import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
 
 import org.apache.chemistry.Type;
-import org.apache.chemistry.atompub.Atom;
+import org.apache.chemistry.atompub.AtomPub;
 import org.apache.chemistry.atompub.client.stax.AbstractObjectReader;
 import org.apache.chemistry.atompub.client.stax.ReadContext;
 import org.apache.chemistry.atompub.client.stax.XmlProperty;
@@ -58,12 +61,18 @@
     }
 
     @Override
+    protected void readAllowableActions(ReadContext ctx, StaxReader reader,
+            APPObjectEntry object, Map<QName, Boolean> allowableActions) {
+        object.allowableActions = Collections.unmodifiableMap(allowableActions);
+    }
+
+    @Override
     protected void readAtomElement(ReadContext ctx, StaxReader reader,
             APPObjectEntry object) throws XMLStreamException {
         String name = reader.getLocalName();
         if ("link".equals(name)) {
-            String rel = reader.getAttributeValue(Atom.ATOM_NS, "rel");
-            String href = reader.getAttributeValue(Atom.ATOM_NS, "href");
+            String rel = reader.getAttributeValue(AtomPub.ATOM_NS, "rel");
+            String href = reader.getAttributeValue(AtomPub.ATOM_NS, "href");
             object.addLink(rel, href);
             // } else if ("id".equals(name)) {
             // object.id = new URI(id);

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java Tue Aug  4 04:26:32 2009
@@ -29,11 +29,11 @@
 
 import javax.xml.stream.XMLStreamException;
 
+import org.apache.chemistry.CMIS;
 import org.apache.chemistry.Choice;
 import org.apache.chemistry.PropertyDefinition;
 import org.apache.chemistry.PropertyType;
 import org.apache.chemistry.Updatability;
-import org.apache.chemistry.atompub.CMIS;
 import org.apache.chemistry.atompub.ValueAdapter;
 import org.apache.chemistry.xml.stax.ChildrenNavigator;
 import org.apache.chemistry.xml.stax.StaxReader;

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepository.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepository.java Tue Aug  4 04:26:32 2009
@@ -30,7 +30,7 @@
 import org.apache.chemistry.SPI;
 import org.apache.chemistry.Type;
 import org.apache.chemistry.TypeManager;
-import org.apache.chemistry.atompub.CMIS;
+import org.apache.chemistry.atompub.AtomPubCMIS;
 import org.apache.chemistry.atompub.URITemplate;
 import org.apache.chemistry.atompub.client.connector.APPContentManager;
 import org.apache.chemistry.atompub.client.connector.Request;
@@ -82,8 +82,8 @@
         return info.getName();
     }
 
-    public URI getURI() {
-        throw new UnsupportedOperationException("Not yet implemented");
+    public URI getThinClientURI() {
+        return info.getThinClientURI();
     }
 
     public SPI getSPI() {
@@ -150,7 +150,7 @@
             return;
         }
         try {
-            String href = getCollectionHref(CMIS.COL_TYPES_CHILDREN);
+            String href = getCollectionHref(AtomPubCMIS.COL_TYPES_CHILDREN);
             if (href == null) {
                 throw new IllegalArgumentException(
                         "Invalid CMIS repository. No types children collection defined");

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryCapabilities.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryCapabilities.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryCapabilities.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryCapabilities.java Tue Aug  4 04:26:32 2009
@@ -16,11 +16,11 @@
  */
 package org.apache.chemistry.atompub.client;
 
-import org.apache.chemistry.ACLCapability;
-import org.apache.chemistry.ChangeCapability;
-import org.apache.chemistry.JoinCapability;
-import org.apache.chemistry.QueryCapability;
-import org.apache.chemistry.RenditionCapability;
+import org.apache.chemistry.CapabilityACL;
+import org.apache.chemistry.CapabilityChange;
+import org.apache.chemistry.CapabilityJoin;
+import org.apache.chemistry.CapabilityQuery;
+import org.apache.chemistry.CapabilityRendition;
 import org.apache.chemistry.RepositoryCapabilities;
 
 /**
@@ -28,15 +28,15 @@
  */
 public class APPRepositoryCapabilities implements RepositoryCapabilities {
 
-    protected JoinCapability joinCapability;
+    protected CapabilityJoin joinCapability;
 
-    protected QueryCapability queryCapability;
+    protected CapabilityQuery queryCapability;
 
-    protected RenditionCapability renditionCapability;
+    protected CapabilityRendition renditionCapability;
 
-    protected ChangeCapability changeCapability;
+    protected CapabilityChange changeCapability;
 
-    protected ACLCapability aclCapability;
+    protected CapabilityACL aclCapability;
 
     protected boolean hasUnfiling;
 
@@ -54,23 +54,23 @@
 
     protected boolean isPWCUpdatable;
 
-    public JoinCapability getJoinCapability() {
+    public CapabilityJoin getJoinCapability() {
         return joinCapability;
     }
 
-    public QueryCapability getQueryCapability() {
+    public CapabilityQuery getQueryCapability() {
         return queryCapability;
     }
 
-    public RenditionCapability getRenditionCapability() {
+    public CapabilityRendition getRenditionCapability() {
         return renditionCapability;
     }
 
-    public ChangeCapability getChangeCapability() {
+    public CapabilityChange getChangeCapability() {
         return changeCapability;
     }
 
-    public ACLCapability getACLCapability() {
+    public CapabilityACL getACLCapability() {
         return aclCapability;
     }
 
@@ -131,7 +131,7 @@
         this.hasVersionSpecificFiling = hasVersionSpecificFiling;
     }
 
-    public void setJoinCapability(JoinCapability joinCapability) {
+    public void setJoinCapability(CapabilityJoin joinCapability) {
         this.joinCapability = joinCapability;
     }
 
@@ -143,19 +143,19 @@
         this.isPWCUpdatable = isPWCUpdatable;
     }
 
-    public void setQueryCapability(QueryCapability queryCapability) {
+    public void setQueryCapability(CapabilityQuery queryCapability) {
         this.queryCapability = queryCapability;
     }
 
-    public void setRenditionCapability(RenditionCapability renditionCapability) {
+    public void setRenditionCapability(CapabilityRendition renditionCapability) {
         this.renditionCapability = renditionCapability;
     }
 
-    public void setChangeCapability(ChangeCapability changeCapability) {
+    public void setChangeCapability(CapabilityChange changeCapability) {
         this.changeCapability = changeCapability;
     }
 
-    public void setACLCapability(ACLCapability aclCapability) {
+    public void setACLCapability(CapabilityACL aclCapability) {
         this.aclCapability = aclCapability;
     }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryInfo.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryInfo.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryInfo.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPRepositoryInfo.java Tue Aug  4 04:26:32 2009
@@ -17,6 +17,7 @@
 package org.apache.chemistry.atompub.client;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -25,12 +26,14 @@
 
 import org.apache.chemistry.ACLCapabilityType;
 import org.apache.chemistry.BaseType;
+import org.apache.chemistry.CMIS;
 import org.apache.chemistry.ObjectId;
 import org.apache.chemistry.RepositoryCapabilities;
 import org.apache.chemistry.RepositoryEntry;
 import org.apache.chemistry.RepositoryInfo;
-import org.apache.chemistry.atompub.CMIS;
 import org.apache.chemistry.impl.simple.SimpleObjectId;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 
 /**
@@ -38,6 +41,8 @@
  */
 public class APPRepositoryInfo implements RepositoryInfo {
 
+    public static final Log log = LogFactory.getLog(APPRepositoryInfo.class);
+
     protected final Map<String, Object> map;
 
     protected final RepositoryCapabilities caps;
@@ -52,11 +57,6 @@
                 : Collections.unmodifiableSet(EnumSet.copyOf(changeLogBaseTypes));
     }
 
-    public URI getURI() {
-        // TODO: what for?
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
     public String getString(String name) {
         return (String) map.get(name);
     }
@@ -77,6 +77,16 @@
         return getString(CMIS.REPOSITORY_RELATIONSHIP.getLocalPart());
     }
 
+    public URI getThinClientURI() {
+        String uri = getString(CMIS.THIN_CLIENT_URI.getLocalPart());
+        try {
+            return uri == null ? null : new URI(uri);
+        } catch (URISyntaxException e) {
+            log.error("Invalid URI: " + uri, e);
+            return null;
+        }
+    }
+
     public String getDescription() {
         return getString(CMIS.REPOSITORY_DESCRIPTION.getLocalPart());
     }
@@ -133,7 +143,7 @@
 
     @Override
     public String toString() {
-        return getName() + " - " + getURI();
+        return getClass().getSimpleName() + '(' + getName() + ')';
     }
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java?rev=800672&r1=800671&r2=800672&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java Tue Aug  4 04:26:32 2009
@@ -25,10 +25,10 @@
 import java.util.Map;
 
 import org.apache.chemistry.BaseType;
+import org.apache.chemistry.CMIS;
 import org.apache.chemistry.ContentStreamPresence;
 import org.apache.chemistry.PropertyDefinition;
 import org.apache.chemistry.Type;
-import org.apache.chemistry.atompub.CMIS;
 import org.apache.chemistry.atompub.client.stax.ReadContext;
 import org.apache.chemistry.atompub.client.stax.XmlProperty;
 



Mime
View raw message