Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 34212 invoked from network); 15 Apr 2010 14:06:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Apr 2010 14:06:12 -0000 Received: (qmail 29381 invoked by uid 500); 15 Apr 2010 14:06:12 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 29346 invoked by uid 500); 15 Apr 2010 14:06:12 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 29334 invoked by uid 99); 15 Apr 2010 14:06:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 14:06:12 +0000 X-ASF-Spam-Status: No, hits=-1432.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Apr 2010 14:06:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7B82D23889F1; Thu, 15 Apr 2010 14:05:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r934417 [2/7] - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/ chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/or... Date: Thu, 15 Apr 2010 14:05:42 -0000 To: chemistry-commits@incubator.apache.org From: fguillaume@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100415140546.7B82D23889F1@eris.apache.org> Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/RepositoryServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -33,14 +33,14 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.api.TypeDefinition; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryService; import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException; import org.apache.chemistry.opencmis.commons.impl.Constants; import org.apache.chemistry.opencmis.commons.impl.UrlBuilder; import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionContainerImpl; import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionListImpl; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisTypeDefinitionType; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryService; /** * Repository Service AtomPub client. @@ -64,7 +64,7 @@ public class RepositoryServiceImpl exten * org.apache.opencmis.client.provider.RepositoryService#getRepositoryInfos(org.apache.opencmis * .client.provider .ExtensionsData) */ - public List getRepositoryInfos(ExtensionsData extension) { + public List getRepositoryInfos(ExtensionsData extension) { return getRepositoriesInternal(null); } @@ -74,16 +74,16 @@ public class RepositoryServiceImpl exten * @see org.apache.opencmis.client.provider.RepositoryService#getRepositoryInfo(java.lang.String, * org.apache.opencmis.client.provider.ExtensionsData) */ - public RepositoryInfoData getRepositoryInfo(String repositoryId, ExtensionsData extension) { - List repositoryInfos = getRepositoriesInternal(repositoryId); + public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) { + List repositoryInfos = getRepositoriesInternal(repositoryId); // find the repository - for (RepositoryInfoData info : repositoryInfos) { - if (info.getRepositoryId() == null) { + for (RepositoryInfo info : repositoryInfos) { + if (info.getId() == null) { continue; } - if (info.getRepositoryId().equals(repositoryId)) { + if (info.getId().equals(repositoryId)) { return info; } } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -32,6 +32,12 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomFeed; import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomLink; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.VersioningService; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.exceptions.CmisConnectionException; import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException; @@ -42,12 +48,6 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.UrlBuilder; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisPropertiesType; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.VersioningService; /** * Versioning Service AtomPub client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -22,13 +22,13 @@ import static org.apache.chemistry.openc import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.AclService; import org.apache.chemistry.opencmis.commons.enums.AclPropagation; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.ACLServicePort; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumACLPropagation; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.AclService; /** * ACL Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java Thu Apr 15 14:05:36 2010 @@ -21,15 +21,15 @@ package org.apache.chemistry.opencmis.cl import org.apache.chemistry.opencmis.client.bindings.spi.CmisSpi; import org.apache.chemistry.opencmis.client.bindings.spi.CmisSpiFactory; import org.apache.chemistry.opencmis.client.bindings.spi.Session; -import org.apache.chemistry.opencmis.commons.provider.AclService; -import org.apache.chemistry.opencmis.commons.provider.DiscoveryService; -import org.apache.chemistry.opencmis.commons.provider.MultiFilingService; -import org.apache.chemistry.opencmis.commons.provider.NavigationService; -import org.apache.chemistry.opencmis.commons.provider.ObjectService; -import org.apache.chemistry.opencmis.commons.provider.PolicyService; -import org.apache.chemistry.opencmis.commons.provider.RelationshipService; -import org.apache.chemistry.opencmis.commons.provider.RepositoryService; -import org.apache.chemistry.opencmis.commons.provider.VersioningService; +import org.apache.chemistry.opencmis.commons.bindings.AclService; +import org.apache.chemistry.opencmis.commons.bindings.DiscoveryService; +import org.apache.chemistry.opencmis.commons.bindings.MultiFilingService; +import org.apache.chemistry.opencmis.commons.bindings.NavigationService; +import org.apache.chemistry.opencmis.commons.bindings.ObjectService; +import org.apache.chemistry.opencmis.commons.bindings.PolicyService; +import org.apache.chemistry.opencmis.commons.bindings.RelationshipService; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryService; +import org.apache.chemistry.opencmis.commons.bindings.VersioningService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/DiscoveryServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -26,15 +26,15 @@ import java.math.BigInteger; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.DiscoveryService; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectListType; import org.apache.chemistry.opencmis.commons.impl.jaxb.DiscoveryServicePort; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumIncludeRelationships; -import org.apache.chemistry.opencmis.commons.provider.DiscoveryService; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; /** * Discovery Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/MultiFilingServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -23,11 +23,11 @@ import static org.apache.chemistry.openc import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.MultiFilingService; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisExtensionType; import org.apache.chemistry.opencmis.commons.impl.jaxb.MultiFilingServicePort; -import org.apache.chemistry.opencmis.commons.provider.MultiFilingService; /** * MultiFiling Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/NavigationServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/NavigationServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/NavigationServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/NavigationServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -26,6 +26,12 @@ import java.util.List; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.NavigationService; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; +import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; @@ -33,12 +39,6 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectParentsType; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumIncludeRelationships; import org.apache.chemistry.opencmis.commons.impl.jaxb.NavigationServicePort; -import org.apache.chemistry.opencmis.commons.provider.NavigationService; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; -import org.apache.chemistry.opencmis.commons.provider.ObjectParentData; /** * Navigation Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -30,6 +30,15 @@ import java.util.List; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectService; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.RenditionData; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.enums.UnfileObjects; import org.apache.chemistry.opencmis.commons.enums.VersioningState; @@ -41,15 +50,6 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumUnfileObject; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumVersioningState; import org.apache.chemistry.opencmis.commons.impl.jaxb.ObjectServicePort; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.FailedToDeleteData; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectService; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.RenditionData; /** * Object Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PolicyServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -27,13 +27,13 @@ import java.util.List; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.PolicyService; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisExtensionType; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType; import org.apache.chemistry.opencmis.commons.impl.jaxb.PolicyServicePort; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.PolicyService; /** * Policy Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RelationshipServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -24,13 +24,13 @@ import java.math.BigInteger; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; +import org.apache.chemistry.opencmis.commons.bindings.RelationshipService; import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumRelationshipDirection; import org.apache.chemistry.opencmis.commons.impl.jaxb.RelationshipServicePort; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; -import org.apache.chemistry.opencmis.commons.provider.RelationshipService; /** * Relationship Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/RepositoryServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -30,13 +30,13 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.api.TypeDefinition; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryService; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisRepositoryEntryType; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisRepositoryInfoType; import org.apache.chemistry.opencmis.commons.impl.jaxb.RepositoryServicePort; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryService; /** * Repository Service Web Services client. @@ -63,16 +63,16 @@ public class RepositoryServiceImpl exten * org.apache.opencmis.client.provider.RepositoryService#getRepositoryInfos(org.apache.opencmis.client.provider * .ExtensionsData) */ - public List getRepositoryInfos(ExtensionsData extension) { + public List getRepositoryInfos(ExtensionsData extension) { RepositoryServicePort port = fPortProvider.getRepositoryServicePort(); - List infos = null; + List infos = null; try { // get the list of repositories List entries = port.getRepositories(convert(extension)); if (entries != null) { - infos = new ArrayList(); + infos = new ArrayList(); // iterate through the list and fetch repository infos for (CmisRepositoryEntryType entry : entries) { @@ -97,7 +97,7 @@ public class RepositoryServiceImpl exten * @see org.apache.opencmis.client.provider.RepositoryService#getRepositoryInfo(java.lang.String, * org.apache.opencmis.client.provider.ExtensionsData) */ - public RepositoryInfoData getRepositoryInfo(String repositoryId, ExtensionsData extension) { + public RepositoryInfo getRepositoryInfo(String repositoryId, ExtensionsData extension) { RepositoryServicePort port = fPortProvider.getRepositoryServicePort(); try { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java Thu Apr 15 14:05:36 2010 @@ -29,6 +29,12 @@ import java.util.List; import org.apache.chemistry.opencmis.client.bindings.spi.Session; import org.apache.chemistry.opencmis.commons.api.ExtensionsData; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.VersioningService; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisException; @@ -36,12 +42,6 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType; import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumIncludeRelationships; import org.apache.chemistry.opencmis.commons.impl.jaxb.VersioningServicePort; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.VersioningService; /** * Versioning Service Web Services client. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AclMergeTest.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AclMergeTest.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AclMergeTest.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AclMergeTest.java Thu Apr 15 14:05:36 2010 @@ -26,11 +26,11 @@ import java.util.Map; import junit.framework.TestCase; import org.apache.chemistry.opencmis.client.bindings.spi.atompub.AbstractAtomPubService; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlEntryImpl; import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlListImpl; import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlPrincipalDataImpl; -import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; /** * Test for the ACL merging that is necessary in the AtomPub binding implementation. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomPubTestBindingFactory.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomPubTestBindingFactory.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomPubTestBindingFactory.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AtomPubTestBindingFactory.java Thu Apr 15 14:05:36 2010 @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadOnlyTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadOnlyTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadOnlyTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadOnlyTests.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.chemistry.opencmis.client.bindings.framework.AbstractSimpleReadOnlyTests; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadWriteTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadWriteTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadWriteTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/SimpleReadWriteTests.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.chemistry.opencmis.client.bindings.framework.AbstractSimpleReadWriteTests; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java Thu Apr 15 14:05:36 2010 @@ -36,32 +36,32 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.api.ExtensionsData; import org.apache.chemistry.opencmis.commons.api.PropertyDefinition; import org.apache.chemistry.opencmis.commons.api.TypeDefinition; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData; +import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList; +import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyDateTimeData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData; +import org.apache.chemistry.opencmis.commons.bindings.RenditionData; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; import org.apache.chemistry.opencmis.commons.enums.AclPropagation; import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl; import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges; import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery; -import org.apache.chemistry.opencmis.commons.enums.CapabilityRendition; +import org.apache.chemistry.opencmis.commons.enums.CapabilityRenditions; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.enums.UnfileObjects; import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException; -import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData; -import org.apache.chemistry.opencmis.commons.provider.BindingsObjectFactory; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList; -import org.apache.chemistry.opencmis.commons.provider.ObjectParentData; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.PropertyData; -import org.apache.chemistry.opencmis.commons.provider.PropertyDateTimeData; -import org.apache.chemistry.opencmis.commons.provider.PropertyIdData; -import org.apache.chemistry.opencmis.commons.provider.PropertyStringData; -import org.apache.chemistry.opencmis.commons.provider.RenditionData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -253,26 +253,26 @@ public abstract class AbstractCmisTestCa * Returns the id of the first repository. */ protected String getFirstRepositoryId() { - List repositories = getBinding().getRepositoryService().getRepositoryInfos( + List repositories = getBinding().getRepositoryService().getRepositoryInfos( null); assertNotNull(repositories); assertFalse(repositories.isEmpty()); - assertNotNull(repositories.get(0).getRepositoryId()); + assertNotNull(repositories.get(0).getId()); - return repositories.get(0).getRepositoryId(); + return repositories.get(0).getId(); } /** * Returns the info object of the test repository. */ - protected RepositoryInfoData getRepositoryInfo() { - RepositoryInfoData repositoryInfo = getBinding().getRepositoryService().getRepositoryInfo( + protected RepositoryInfo getRepositoryInfo() { + RepositoryInfo repositoryInfo = getBinding().getRepositoryService().getRepositoryInfo( getTestRepositoryId(), null); assertNotNull(repositoryInfo); - assertNotNull(repositoryInfo.getRepositoryId()); - assertEquals(getTestRepositoryId(), repositoryInfo.getRepositoryId()); + assertNotNull(repositoryInfo.getId()); + assertEquals(getTestRepositoryId(), repositoryInfo.getId()); return repositoryInfo; } @@ -281,7 +281,7 @@ public abstract class AbstractCmisTestCa * Returns the root folder of the test repository. */ protected String getRootFolderId() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); assertNotNull(repository.getRootFolderId()); @@ -292,97 +292,97 @@ public abstract class AbstractCmisTestCa * Returns if the test repository supports reading ACLs. */ protected boolean supportsDiscoverACLs() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - return (repository.getRepositoryCapabilities().getCapabilityAcl() != CapabilityAcl.NONE); + return (repository.getCapabilities().getAclCapability() != CapabilityAcl.NONE); } /** * Returns if the test repository supports setting ACLs. */ protected boolean supportsManageACLs() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - return (repository.getRepositoryCapabilities().getCapabilityAcl() == CapabilityAcl.MANAGE); + return (repository.getCapabilities().getAclCapability() == CapabilityAcl.MANAGE); } /** * Returns if the test repository supports renditions. */ protected boolean supportsRenditions() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - if (repository.getRepositoryCapabilities().getCapabilityRenditions() == null) { + if (repository.getCapabilities().getRenditionsCapability() == null) { return false; } - return (repository.getRepositoryCapabilities().getCapabilityRenditions() != CapabilityRendition.NONE); + return (repository.getCapabilities().getRenditionsCapability() != CapabilityRenditions.NONE); } /** * Returns if the test repository supports descendants. */ protected boolean supportsDescendants() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - if (repository.getRepositoryCapabilities().supportsGetDescendants() == null) { + if (repository.getCapabilities().isGetDescendantsSupported() == null) { return false; } - return repository.getRepositoryCapabilities().supportsGetDescendants().booleanValue(); + return repository.getCapabilities().isGetDescendantsSupported().booleanValue(); } /** * Returns if the test repository supports descendants. */ protected boolean supportsFolderTree() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - if (repository.getRepositoryCapabilities().supportsGetFolderTree() == null) { + if (repository.getCapabilities().isGetFolderTreeSupported() == null) { return false; } - return repository.getRepositoryCapabilities().supportsGetFolderTree().booleanValue(); + return repository.getCapabilities().isGetFolderTreeSupported().booleanValue(); } /** * Returns if the test repository supports content changes. */ protected boolean supportsContentChanges() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - if (repository.getRepositoryCapabilities().getCapabilityChanges() == null) { + if (repository.getCapabilities().getChangesCapability() == null) { return false; } - return (repository.getRepositoryCapabilities().getCapabilityChanges() != CapabilityChanges.NONE); + return (repository.getCapabilities().getChangesCapability() != CapabilityChanges.NONE); } /** * Returns if the test repository supports query. */ protected boolean supportsQuery() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); - if (repository.getRepositoryCapabilities().getCapabilityQuery() == null) { + if (repository.getCapabilities().getQueryCapability() == null) { return false; } - return (repository.getRepositoryCapabilities().getCapabilityQuery() != CapabilityQuery.NONE); + return (repository.getCapabilities().getQueryCapability() != CapabilityQuery.NONE); } /** @@ -423,9 +423,9 @@ public abstract class AbstractCmisTestCa * Returns the AclPropagation from the ACL capabilities. */ protected AclPropagation getAclPropagation() { - RepositoryInfoData repository = getRepositoryInfo(); + RepositoryInfo repository = getRepositoryInfo(); - assertNotNull(repository.getRepositoryCapabilities()); + assertNotNull(repository.getCapabilities()); if (repository.getAclCapabilities().getAclPropagation() == null) { return AclPropagation.REPOSITORYDETERMINED; Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java Thu Apr 15 14:05:36 2010 @@ -30,20 +30,20 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.api.TypeDefinition; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.RenditionData; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.RenditionData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; /** * Simple read-only tests. @@ -69,14 +69,14 @@ public abstract class AbstractSimpleRead return; } - RepositoryInfoData repInfo = getRepositoryInfo(); + RepositoryInfo repInfo = getRepositoryInfo(); Tools.print(repInfo); - assertNotNull(repInfo.getRepositoryId()); + assertNotNull(repInfo.getId()); assertNotNull(repInfo.getCmisVersionSupported()); assertNotNull(repInfo.getRootFolderId()); - assertNotNull(repInfo.getRepositoryCapabilities()); + assertNotNull(repInfo.getCapabilities()); } /** Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java Thu Apr 15 14:05:36 2010 @@ -23,17 +23,17 @@ import java.util.Collections; import java.util.List; import org.apache.chemistry.opencmis.commons.PropertyIds; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry; +import org.apache.chemistry.opencmis.commons.bindings.AccessControlList; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyData; import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates; import org.apache.chemistry.opencmis.commons.enums.UnfileObjects; import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException; -import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry; -import org.apache.chemistry.opencmis.commons.provider.AccessControlList; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.PropertyData; /** * Simple read-write test. @@ -189,8 +189,8 @@ public abstract class AbstractSimpleRead return; } - boolean requiresCheckOut = getRepositoryInfo().getRepositoryCapabilities() - .getCapabilityContentStreamUpdatability() == CapabilityContentStreamUpdates.PWCONLY; + boolean requiresCheckOut = getRepositoryInfo().getCapabilities() + .getContentStreamUpdatesCapability() == CapabilityContentStreamUpdates.PWCONLY; boolean isVersionable = isVersionable(getDefaultDocumentType()); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/Tools.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/Tools.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/Tools.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/Tools.java Thu Apr 15 14:05:36 2010 @@ -22,9 +22,9 @@ import java.util.List; import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer; -import org.apache.chemistry.opencmis.commons.provider.PropertiesData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer; +import org.apache.chemistry.opencmis.commons.bindings.PropertiesData; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; /** * @author Florian Müller @@ -32,19 +32,19 @@ import org.apache.chemistry.opencmis.com */ public class Tools { - public static void print(RepositoryInfoData repositoryInfo) { + public static void print(RepositoryInfo repositoryInfo) { if (repositoryInfo == null) { return; } System.out.println("-------------"); - System.out.println("Id: " + repositoryInfo.getRepositoryId()); - System.out.println("Name: " + repositoryInfo.getRepositoryName()); + System.out.println("Id: " + repositoryInfo.getId()); + System.out.println("Name: " + repositoryInfo.getName()); System.out.println("CMIS Version: " + repositoryInfo.getCmisVersionSupported()); System.out.println("Product: " + repositoryInfo.getVendorName() + " / " + repositoryInfo.getProductName() + " " + repositoryInfo.getProductVersion()); System.out.println("Root Folder: " + repositoryInfo.getRootFolderId()); - System.out.println("Capabilities: " + repositoryInfo.getRepositoryCapabilities()); + System.out.println("Capabilities: " + repositoryInfo.getCapabilities()); System.out.println("ACL Capabilities: " + repositoryInfo.getAclCapabilities()); System.out.println("-------------"); } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/misc/ConverterTest.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/misc/ConverterTest.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/misc/ConverterTest.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/misc/ConverterTest.java Thu Apr 15 14:05:36 2010 @@ -25,12 +25,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import junit.framework.TestCase; import org.apache.chemistry.opencmis.commons.api.TypeDefinition; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.PermissionDefinition; +import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping; +import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo; import org.apache.chemistry.opencmis.commons.enums.AclPropagation; import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds; import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl; @@ -38,7 +43,7 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates; import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin; import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery; -import org.apache.chemistry.opencmis.commons.enums.CapabilityRendition; +import org.apache.chemistry.opencmis.commons.enums.CapabilityRenditions; import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed; import org.apache.chemistry.opencmis.commons.impl.Converter; import org.apache.chemistry.opencmis.commons.impl.dataobjects.AclCapabilitiesDataImpl; @@ -47,29 +52,25 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionDefinitionDataImpl; import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionMappingDataImpl; import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoDataImpl; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.PermissionDefinitionData; -import org.apache.chemistry.opencmis.commons.provider.PermissionMappingData; -import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl; /** * Tests converter methods. - * + * * @author Florian Müller - * + * */ public class ConverterTest extends TestCase { public void testRepositoryInfo() throws Exception { // dry run - RepositoryInfoDataImpl obj1 = new RepositoryInfoDataImpl(); - RepositoryInfoData obj2 = Converter.convert(Converter.convert(obj1)); + RepositoryInfoImpl obj1 = new RepositoryInfoImpl(); + RepositoryInfo obj2 = Converter.convert(Converter.convert(obj1)); assertDataObjectsEquals("RepositoryInfo", obj1, obj2); // values - obj1 = new RepositoryInfoDataImpl(); + obj1 = new RepositoryInfoImpl(); obj1.setChangesIncomplete(Boolean.TRUE); obj1.setChangesOnType(Collections.singletonList(BaseObjectTypeIds.CMIS_DOCUMENT)); obj1.setCmisVersionSupported("1.0"); @@ -92,7 +93,7 @@ public class ConverterTest extends TestC cap1.setCapabilityContentStreamUpdates(CapabilityContentStreamUpdates.ANYTIME); cap1.setCapabilityJoin(CapabilityJoin.INNERANDOUTER); cap1.setCapabilityQuery(CapabilityQuery.BOTHCOMBINED); - cap1.setCapabilityRendition(CapabilityRendition.READ); + cap1.setCapabilityRendition(CapabilityRenditions.READ); cap1.setIsPwcSearchable(Boolean.TRUE); cap1.setIsPwcUpdatable(Boolean.TRUE); cap1.setSupportsGetDescendants(Boolean.TRUE); @@ -104,7 +105,7 @@ public class ConverterTest extends TestC AclCapabilitiesDataImpl acl1 = new AclCapabilitiesDataImpl(); acl1.setAclPropagation(AclPropagation.PROPAGATE); - List pddList = new ArrayList(); + List pddList = new ArrayList(); PermissionDefinitionDataImpl pdd1 = new PermissionDefinitionDataImpl(); pdd1.setPermission("test:perm1"); pdd1.setDescription("Permission1"); @@ -114,16 +115,16 @@ public class ConverterTest extends TestC pdd2.setDescription("Permission2"); pddList.add(pdd2); acl1.setPermissionDefinitionData(pddList); - List pmdList = new ArrayList(); + Map pmd = new LinkedHashMap(); PermissionMappingDataImpl pmd1 = new PermissionMappingDataImpl(); - pmd1.setKey(PermissionMappingData.KEY_CAN_CREATE_DOCUMENT_FOLDER); + pmd1.setKey(PermissionMapping.CAN_CREATE_DOCUMENT_FOLDER); pmd1.setPermissions(Arrays.asList(new String[] { "p1", "p2" })); - pmdList.add(pmd1); + pmd.put(pmd1.getKey(), pmd1); PermissionMappingDataImpl pmd2 = new PermissionMappingDataImpl(); - pmd2.setKey(PermissionMappingData.KEY_CAN_DELETE_OBJECT); + pmd2.setKey(PermissionMapping.CAN_DELETE_OBJECT); pmd2.setPermissions(Arrays.asList(new String[] { "p3", "p4" })); - pmdList.add(pmd2); - acl1.setPermissionMappingData(pmdList); + pmd.put(pmd2.getKey(), pmd2); + acl1.setPermissionMappingData(pmd); obj1.setAclCapabilities(acl1); obj2 = Converter.convert(Converter.convert(obj1)); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadOnlyTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadOnlyTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadOnlyTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadOnlyTests.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.chemistry.opencmis.client.bindings.framework.AbstractSimpleReadOnlyTests; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadWriteTests.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadWriteTests.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadWriteTests.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/SimpleReadWriteTests.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; import org.apache.chemistry.opencmis.client.bindings.framework.AbstractSimpleReadWriteTests; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/webservices/WebServicesTestBindingFactory.java Thu Apr 15 14:05:36 2010 @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; /** * @author Florian Müller Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java Thu Apr 15 14:05:36 2010 @@ -45,17 +45,17 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.runtime.util.AbstractPagingList; import org.apache.chemistry.opencmis.commons.PropertyIds; import org.apache.chemistry.opencmis.commons.api.PropertyDefinition; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; +import org.apache.chemistry.opencmis.commons.bindings.RelationshipService; +import org.apache.chemistry.opencmis.commons.bindings.RenditionData; import org.apache.chemistry.opencmis.commons.enums.AclPropagation; import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds; import org.apache.chemistry.opencmis.commons.enums.Cardinality; import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection; import org.apache.chemistry.opencmis.commons.enums.Updatability; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; -import org.apache.chemistry.opencmis.commons.provider.RelationshipService; -import org.apache.chemistry.opencmis.commons.provider.RenditionData; /** * Base class for all persistent session object impl classes. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentFilableCmisObject.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentFilableCmisObject.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentFilableCmisObject.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentFilableCmisObject.java Thu Apr 15 14:05:36 2010 @@ -26,13 +26,13 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.api.Folder; import org.apache.chemistry.opencmis.client.api.ObjectId; import org.apache.chemistry.opencmis.commons.PropertyIds; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectParentData; -import org.apache.chemistry.opencmis.commons.provider.PropertyData; -import org.apache.chemistry.opencmis.commons.provider.PropertyIdData; -import org.apache.chemistry.opencmis.commons.provider.PropertyStringData; /** * Base class for all filable persistent session object impl classes. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AllowableActionsImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AllowableActionsImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AllowableActionsImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AllowableActionsImpl.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import java.io.Serializable; import java.util.Map; import org.apache.chemistry.opencmis.client.api.AllowableActions; -import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData; +import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData; /** * Allowable actions implementation. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/CmisBindingHelper.java Thu Apr 15 14:05:36 2010 @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory; import org.apache.chemistry.opencmis.commons.SessionParameter; +import org.apache.chemistry.opencmis.commons.bindings.CmisBinding; import org.apache.chemistry.opencmis.commons.enums.BindingType; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.chemistry.opencmis.commons.provider.CmisBinding; /** * Helper methods for binding handling. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentDocumentImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentDocumentImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentDocumentImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentDocumentImpl.java Thu Apr 15 14:05:36 2010 @@ -36,12 +36,12 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType; import org.apache.chemistry.opencmis.client.api.repository.ObjectFactory; import org.apache.chemistry.opencmis.commons.PropertyIds; +import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData; +import org.apache.chemistry.opencmis.commons.bindings.Holder; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; import org.apache.chemistry.opencmis.commons.enums.Updatability; import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.chemistry.opencmis.commons.provider.ContentStreamData; -import org.apache.chemistry.opencmis.commons.provider.Holder; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; public class PersistentDocumentImpl extends AbstractPersistentFilableCmisObject implements Document { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentFolderImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentFolderImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentFolderImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentFolderImpl.java Thu Apr 15 14:05:36 2010 @@ -42,21 +42,21 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.runtime.util.AbstractPagingList; import org.apache.chemistry.opencmis.client.runtime.util.ContainerImpl; import org.apache.chemistry.opencmis.commons.PropertyIds; +import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData; +import org.apache.chemistry.opencmis.commons.bindings.NavigationService; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList; +import org.apache.chemistry.opencmis.commons.bindings.ObjectList; +import org.apache.chemistry.opencmis.commons.bindings.PropertyData; +import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData; import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.enums.UnfileObjects; import org.apache.chemistry.opencmis.commons.enums.Updatability; import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException; -import org.apache.chemistry.opencmis.commons.provider.FailedToDeleteData; -import org.apache.chemistry.opencmis.commons.provider.NavigationService; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData; -import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList; -import org.apache.chemistry.opencmis.commons.provider.ObjectList; -import org.apache.chemistry.opencmis.commons.provider.PropertyData; -import org.apache.chemistry.opencmis.commons.provider.PropertyStringData; public class PersistentFolderImpl extends AbstractPersistentFilableCmisObject implements Folder { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentPolicyImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentPolicyImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentPolicyImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentPolicyImpl.java Thu Apr 15 14:05:36 2010 @@ -22,7 +22,7 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.api.Policy; import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; public class PersistentPolicyImpl extends AbstractPersistentFilableCmisObject implements Policy { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentRelationshipImpl.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentRelationshipImpl.java?rev=934417&r1=934416&r2=934417&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentRelationshipImpl.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentRelationshipImpl.java Thu Apr 15 14:05:36 2010 @@ -23,7 +23,7 @@ import org.apache.chemistry.opencmis.cli import org.apache.chemistry.opencmis.client.api.Relationship; import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType; import org.apache.chemistry.opencmis.commons.PropertyIds; -import org.apache.chemistry.opencmis.commons.provider.ObjectData; +import org.apache.chemistry.opencmis.commons.bindings.ObjectData; public class PersistentRelationshipImpl extends AbstractPersistentCmisObject implements Relationship {