chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r934455 [1/3] - 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 15:34:38 GMT
Author: fguillaume
Date: Thu Apr 15 15:34:36 2010
New Revision: 934455

URL: http://svn.apache.org/viewvc?rev=934455&view=rev
Log:
Refactor to get rid of duplicate DTOs (and their interfaces): Ace, Acl, Principal

Added:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java   (contents, props changed)
      - copied, changed from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/Acl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java   (contents, props changed)
      - copied, changed from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlEntry.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java   (contents, props changed)
      - copied, changed from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlList.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java   (contents, props changed)
      - copied, changed from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlPrincipalData.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java   (contents, props changed)
      - copied, changed from r934426, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java
Removed:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Ace.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Acl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/Acl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AclImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/ContentStreamImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlEntry.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlList.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlPrincipalData.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java
Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Document.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Folder.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/util/AceList.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AclServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/VersioningServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/AclServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/VersioningServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/atompub/AclMergeTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadWriteTests.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentDocumentImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentFolderImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentSessionImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/PersistentObjectFactoryImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AclService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/BindingsObjectFactory.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/VersioningService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/AclService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java Thu Apr 15 15:34:36 2010
@@ -24,13 +24,15 @@ import java.util.Map;
 
 import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
 import org.apache.chemistry.opencmis.client.api.util.PagingList;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
 import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
 
 /**
  * Base CMIS object.
- * 
+ *
  * See CMIS Domain Model - section 2.1.2.
  */
 public interface CmisObject extends ObjectId {
@@ -84,7 +86,7 @@ public interface CmisObject extends Obje
 
   /**
    * Get the type's base type id.
-   * 
+   *
    * @return
    */
   BaseObjectTypeIds getBaseTypeId();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Document.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Document.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Document.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Document.java Thu Apr 15 15:34:36 2010
@@ -21,6 +21,7 @@ package org.apache.chemistry.opencmis.cl
 import java.util.List;
 import java.util.Map;
 
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Folder.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Folder.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Folder.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Folder.java Thu Apr 15 15:34:36 2010
@@ -24,6 +24,7 @@ import java.util.Map;
 import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
 import org.apache.chemistry.opencmis.client.api.util.Container;
 import org.apache.chemistry.opencmis.client.api.util.PagingList;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/Session.java Thu Apr 15 15:34:36 2010
@@ -27,6 +27,7 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.client.api.repository.ObjectFactory;
 import org.apache.chemistry.opencmis.client.api.util.Container;
 import org.apache.chemistry.opencmis.client.api.util.PagingList;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java Thu Apr 15 15:34:36 2010
@@ -23,8 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
-import org.apache.chemistry.opencmis.client.api.Acl;
 import org.apache.chemistry.opencmis.client.api.AllowableActions;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.client.api.OperationContext;
@@ -36,7 +34,8 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -59,13 +58,7 @@ public interface ObjectFactory {
 
   // ACL and ACE
 
-  Ace createAce(String principal, List<String> permissions, boolean isDirect);
-
-  Acl createAcl(List<Ace> aces, Boolean isExact);
-
-  AccessControlList convertAces(List<Ace> aces);
-
-  Acl convertAcl(AccessControlList acl);
+  Acl convertAces(List<Ace> aces);
 
   // policies
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/util/AceList.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/util/AceList.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/util/AceList.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/util/AceList.java Thu Apr 15 15:34:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.cl
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
 
 public interface AceList extends List<Ace> {
   boolean isExact();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.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/AbstractAtomPubService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AbstractAtomPubService.java Thu Apr 15 15:34:36 2010
@@ -31,7 +31,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.chemistry.opencmis.client.bindings.spi.Session;
-import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.Acl;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAcl;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomBase;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
@@ -42,8 +42,8 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.SessionParameter;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
 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.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
 import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
@@ -72,9 +72,9 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * Base class for all AtomPub clients.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public class AbstractAtomPubService {
 
@@ -538,7 +538,7 @@ public class AbstractAtomPubService {
   /**
    * Checks if at least one ACE list is not empty.
    */
-  protected boolean isAclMergeRequired(AccessControlList addAces, AccessControlList removeAces) {
+  protected boolean isAclMergeRequired(Acl addAces, Acl removeAces) {
     return (addAces != null && addAces.getAces() != null && !addAces.getAces().isEmpty())
         || (removeAces != null && removeAces.getAces() != null && !removeAces.getAces().isEmpty());
   }
@@ -546,12 +546,12 @@ public class AbstractAtomPubService {
   /**
    * Merges the new ACL from original, add and remove ACEs lists.
    */
-  protected AccessControlList mergeAcls(AccessControlList originalAces, AccessControlList addAces,
-      AccessControlList removeAces) {
+  protected Acl mergeAcls(Acl originalAces, Acl addAces,
+          Acl removeAces) {
     Map<String, Set<String>> originals = convertAclToMap(originalAces);
     Map<String, Set<String>> adds = convertAclToMap(addAces);
     Map<String, Set<String>> removes = convertAclToMap(removeAces);
-    List<AccessControlEntry> newACEs = new ArrayList<AccessControlEntry>();
+    List<Ace> newACEs = new ArrayList<Ace>();
 
     // iterate through the original ACEs
     for (Map.Entry<String, Set<String>> ace : originals.entrySet()) {
@@ -589,14 +589,14 @@ public class AbstractAtomPubService {
   /**
    * Converts a list of ACEs into Map for better handling.
    */
-  private Map<String, Set<String>> convertAclToMap(AccessControlList acl) {
+  private Map<String, Set<String>> convertAclToMap(Acl acl) {
     Map<String, Set<String>> result = new HashMap<String, Set<String>>();
 
     if ((acl == null) || (acl.getAces() == null)) {
       return result;
     }
 
-    for (AccessControlEntry ace : acl.getAces()) {
+    for (Ace ace : acl.getAces()) {
       // don't consider indirect ACEs - we can't change them
       if (!ace.isDirect()) {
         // ignore
@@ -604,7 +604,7 @@ public class AbstractAtomPubService {
       }
 
       // although a principal must not be null, check it
-      if ((ace.getPrincipal() == null) || (ace.getPrincipal().getPrincipalId() == null)) {
+      if ((ace.getPrincipal() == null) || (ace.getPrincipal().getId() == null)) {
         // ignore
         continue;
       }
@@ -614,7 +614,7 @@ public class AbstractAtomPubService {
         permissions.addAll(ace.getPermissions());
       }
 
-      result.put(ace.getPrincipal().getPrincipalId(), permissions);
+      result.put(ace.getPrincipal().getId(), permissions);
     }
 
     return result;
@@ -776,7 +776,7 @@ public class AbstractAtomPubService {
   /**
    * Updates the ACL of an object.
    */
-  protected Acl updateAcl(String repositoryId, String objectId, AccessControlList acl,
+  protected AtomAcl updateAcl(String repositoryId, String objectId, Acl acl,
       AclPropagation aclPropagation) {
 
     // find the link
@@ -800,7 +800,7 @@ public class AbstractAtomPubService {
     });
 
     // parse new entry
-    return parse(resp.getStream(), Acl.class);
+    return parse(resp.getStream(), AtomAcl.class);
   }
 
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/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/atompub/AclServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AclServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AclServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -21,9 +21,9 @@ package org.apache.chemistry.opencmis.cl
 import static org.apache.chemistry.opencmis.commons.impl.Converter.convert;
 
 import org.apache.chemistry.opencmis.client.bindings.spi.Session;
-import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.Acl;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAcl;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AclService;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.impl.Constants;
@@ -31,9 +31,9 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * ACL Service AtomPub client.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public class AclServiceImpl extends AbstractAtomPubService implements AclService {
 
@@ -46,20 +46,20 @@ public class AclServiceImpl extends Abst
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.ACLService#applyACL(java.lang.String,
    * java.lang.String, org.apache.opencmis.client.provider.AccessControlList,
    * org.apache.opencmis.client.provider.AccessControlList,
    * org.apache.opencmis.commons.enums.ACLPropagation,
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
-  public AccessControlList applyAcl(String repositoryId, String objectId,
-      AccessControlList addAces, AccessControlList removeAces, AclPropagation aclPropagation,
+  public Acl applyAcl(String repositoryId, String objectId,
+          Acl addAces, Acl removeAces, AclPropagation aclPropagation,
       ExtensionsData extension) {
-    AccessControlList result = null;
+      Acl result = null;
 
     // fetch the current ACL
-    AccessControlList originalAces = getAcl(repositoryId, objectId, false, null);
+    Acl originalAces = getAcl(repositoryId, objectId, false, null);
 
     // if no changes required, just return the ACL
     if (!isAclMergeRequired(addAces, removeAces)) {
@@ -67,10 +67,10 @@ public class AclServiceImpl extends Abst
     }
 
     // merge ACLs
-    AccessControlList newACL = mergeAcls(originalAces, addAces, removeAces);
+    Acl newACL = mergeAcls(originalAces, addAces, removeAces);
 
     // update ACL
-    Acl acl = updateAcl(repositoryId, objectId, newACL, aclPropagation);
+    AtomAcl acl = updateAcl(repositoryId, objectId, newACL, aclPropagation);
     result = convert(acl.getACL(), null);
 
     return result;
@@ -78,11 +78,11 @@ public class AclServiceImpl extends Abst
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.ACLService#getACL(java.lang.String, java.lang.String,
    * java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
    */
-  public AccessControlList getAcl(String repositoryId, String objectId,
+  public org.apache.chemistry.opencmis.commons.bindings.Acl getAcl(String repositoryId, String objectId,
       Boolean onlyBasicPermissions, ExtensionsData extension) {
 
     // find the link
@@ -97,7 +97,7 @@ public class AclServiceImpl extends Abst
 
     // read and parse
     HttpUtils.Response resp = read(url);
-    Acl acl = parse(resp.getStream(), Acl.class);
+    AtomAcl acl = parse(resp.getStream(), AtomAcl.class);
 
     return convert(acl.getACL(), null);
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.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/AtomPubParser.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java Thu Apr 15 15:34:36 2010
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.Acl;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAcl;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AllowableActions;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomBase;
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
@@ -308,9 +308,9 @@ public class AtomPubParser implements Cm
   /**
    * Parses an ACL document.
    */
-  private Acl parseACL(XMLStreamReader parser) throws Exception {
+  private AtomAcl parseACL(XMLStreamReader parser) throws Exception {
     AtomElement elemenet = unmarshalElement(parser, CmisAccessControlListType.class);
-    return new Acl((CmisAccessControlListType) elemenet.getObject());
+    return new AtomAcl((CmisAccessControlListType) elemenet.getObject());
   }
 
   /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/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/atompub/ObjectServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -34,7 +34,7 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomLink;
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
@@ -54,7 +54,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.Constants;
 import org.apache.chemistry.opencmis.commons.impl.ReturnVersion;
 import org.apache.chemistry.opencmis.commons.impl.UrlBuilder;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.FailedToDeleteDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisProperty;
@@ -88,7 +88,7 @@ public class ObjectServiceImpl extends A
    */
   public String createDocument(String repositoryId, PropertiesData properties, String folderId,
       ContentStream contentStream, VersioningState versioningState, List<String> policies,
-      AccessControlList addAces, AccessControlList removeAces, ExtensionsData extension) {
+      Acl addAces, Acl removeAces, ExtensionsData extension) {
     checkCreateProperties(properties);
 
     // find the link
@@ -145,7 +145,7 @@ public class ObjectServiceImpl extends A
    */
   public String createDocumentFromSource(String repositoryId, String sourceId,
       PropertiesData properties, String folderId, VersioningState versioningState,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     throw new CmisNotSupportedException(
         "createDocumentFromSource is not supported by the AtomPub binding!");
@@ -161,7 +161,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createFolder(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     checkCreateProperties(properties);
 
@@ -207,7 +207,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createPolicy(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     checkCreateProperties(properties);
 
@@ -253,7 +253,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createRelationship(String repositoryId, PropertiesData properties,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     checkCreateProperties(properties);
 
@@ -491,7 +491,7 @@ public class ObjectServiceImpl extends A
    */
   public ContentStream getContentStream(String repositoryId, String objectId, String streamId,
       BigInteger offset, BigInteger length, ExtensionsData extension) {
-    ContentStreamDataImpl result = new ContentStreamDataImpl();
+    ContentStreamImpl result = new ContentStreamImpl();
 
     // find the link
     String link = loadLink(repositoryId, objectId, AtomPubParser.LINK_REL_CONTENT, null);
@@ -757,12 +757,12 @@ public class ObjectServiceImpl extends A
    * Handles ACL modifications of newly created objects.
    */
   private void handleAclModifications(String repositoryId, AtomEntry entry,
-      AccessControlList addAces, AccessControlList removeAces) {
+      Acl addAces, Acl removeAces) {
     if (!isAclMergeRequired(addAces, removeAces)) {
       return;
     }
 
-    AccessControlList originalAces = null;
+    Acl originalAces = null;
 
     // walk through the entry and find the current ACL
     for (AtomElement element : entry.getElements()) {
@@ -777,7 +777,7 @@ public class ObjectServiceImpl extends A
 
     if (originalAces != null) {
       // merge and update ACL
-      AccessControlList newACL = mergeAcls(originalAces, addAces, removeAces);
+      Acl newACL = mergeAcls(originalAces, addAces, removeAces);
       if (newACL != null) {
         updateAcl(repositoryId, entry.getId(), newACL, null);
       }

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -32,7 +32,7 @@ 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.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -153,7 +153,7 @@ public class VersioningServiceImpl exten
    */
   public void checkIn(String repositoryId, Holder<String> objectId, Boolean major,
       PropertiesData properties, ContentStream contentStream, String checkinComment,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     // we need an object id
     if ((objectId == null) || (objectId.getValue() == null) || (objectId.getValue().length() == 0)) {
@@ -211,7 +211,7 @@ public class VersioningServiceImpl exten
     // set object id
     objectId.setValue(entry.getId());
 
-    AccessControlList originalAces = null;
+    Acl originalAces = null;
 
     lockLinks();
     try {
@@ -237,7 +237,7 @@ public class VersioningServiceImpl exten
     // handle ACL modifications
     if ((originalAces != null) && (isAclMergeRequired(addAces, removeAces))) {
       // merge and update ACL
-      AccessControlList newACL = mergeAcls(originalAces, addAces, removeAces);
+      Acl newACL = mergeAcls(originalAces, addAces, removeAces);
       if (newACL != null) {
         updateAcl(repositoryId, entry.getId(), newACL, null);
       }

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java (from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/Acl.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/objects/AtomAcl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/Acl.java&r1=934418&r2=934455&rev=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/Acl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java Thu Apr 15 15:34:36 2010
@@ -24,17 +24,17 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class Acl extends AtomBase {
+public class AtomAcl extends AtomBase {
 
   private static final long serialVersionUID = 1L;
 
   private CmisAccessControlListType fACL;
 
-  public Acl() {
+  public AtomAcl() {
     super();
   }
 
-  public Acl(CmisAccessControlListType acl) {
+  public AtomAcl(CmisAccessControlListType acl) {
     this();
     setACL(acl);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAcl.java
------------------------------------------------------------------------------
    svn:keywords = Id

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -22,7 +22,7 @@ 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.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AclService;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
@@ -55,8 +55,8 @@ public class AclServiceImpl extends Abst
    * org.apache.opencmis.client.provider.AccessControlList, org.apache.opencmis.client.provider.AccessControlList,
    * org.apache.opencmis.commons.enums.ACLPropagation, org.apache.opencmis.client.provider.ExtensionsData)
    */
-  public AccessControlList applyAcl(String repositoryId, String objectId,
-      AccessControlList addACEs, AccessControlList removeACEs, AclPropagation aclPropagation,
+  public Acl applyAcl(String repositoryId, String objectId,
+      Acl addACEs, Acl removeACEs, AclPropagation aclPropagation,
       ExtensionsData extension) {
     ACLServicePort port = fPortProvider.getACLServicePort();
 
@@ -78,7 +78,7 @@ public class AclServiceImpl extends Abst
    * @see org.apache.opencmis.client.provider.ACLService#getACL(java.lang.String, java.lang.String,
    * java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
    */
-  public AccessControlList getAcl(String repositoryId, String objectId,
+  public Acl getAcl(String repositoryId, String objectId,
       Boolean onlyBasicPermissions, ExtensionsData extension) {
     ACLServicePort port = fPortProvider.getACLServicePort();
 

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -30,7 +30,7 @@ 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.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
@@ -80,7 +80,7 @@ public class ObjectServiceImpl extends A
    */
   public String createDocument(String repositoryId, PropertiesData properties, String folderId,
       ContentStream contentStream, VersioningState versioningState, List<String> policies,
-      AccessControlList addACEs, AccessControlList removeACEs, ExtensionsData extension) {
+      Acl addACEs, Acl removeACEs, ExtensionsData extension) {
     ObjectServicePort port = fPortProvider.getObjectServicePort();
 
     try {
@@ -114,7 +114,7 @@ public class ObjectServiceImpl extends A
    */
   public String createDocumentFromSource(String repositoryId, String sourceId,
       PropertiesData properties, String folderId, VersioningState versioningState,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     ObjectServicePort port = fPortProvider.getObjectServicePort();
 
@@ -147,7 +147,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createFolder(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     ObjectServicePort port = fPortProvider.getObjectServicePort();
 
@@ -179,7 +179,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createPolicy(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     ObjectServicePort port = fPortProvider.getObjectServicePort();
 
@@ -211,7 +211,7 @@ public class ObjectServiceImpl extends A
    * org.apache.opencmis.client.provider.ExtensionsData)
    */
   public String createRelationship(String repositoryId, PropertiesData properties,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     ObjectServicePort port = fPortProvider.getObjectServicePort();
 

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -29,7 +29,7 @@ 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.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -128,7 +128,7 @@ public class VersioningServiceImpl exten
    */
   public void checkIn(String repositoryId, Holder<String> objectId, Boolean major,
       PropertiesData properties, ContentStream contentStream, String checkinComment,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     VersioningServicePort port = fPortProvider.getVersioningServicePort();
 

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -26,8 +26,8 @@ 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.bindings.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 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;
@@ -60,7 +60,7 @@ public class AclMergeTest extends TestCa
     originalAceData.put("p2", new String[] { "perm:read" });
     originalAceData.put("p3", new String[] { "perm:all" });
 
-    AccessControlList originalACEs = createACL(originalAceData);
+    Acl originalACEs = createACL(originalAceData);
 
     // add
     Map<String, String[]> addAceData = new HashMap<String, String[]>();
@@ -68,7 +68,7 @@ public class AclMergeTest extends TestCa
     addAceData.put("p2", new String[] { "perm:write" });
     addAceData.put("p4", new String[] { "perm:all" });
 
-    AccessControlList addACEs = createACL(addAceData);
+    Acl addACEs = createACL(addAceData);
 
     // remove
     Map<String, String[]> removeAceData = new HashMap<String, String[]>();
@@ -76,14 +76,14 @@ public class AclMergeTest extends TestCa
     removeAceData.put("p1", new String[] { "perm:write" });
     removeAceData.put("p3", new String[] { "perm:all" });
 
-    AccessControlList removeACEs = createACL(removeAceData);
+    Acl removeACEs = createACL(removeAceData);
 
-    AccessControlList newACL = service.publicMergeACLs(originalACEs, addACEs, removeACEs);
+    Acl newACL = service.publicMergeACLs(originalACEs, addACEs, removeACEs);
 
     assertEquals(3, newACL.getAces().size());
 
-    for (AccessControlEntry ace : newACL.getAces()) {
-      String principal = ace.getPrincipal().getPrincipalId();
+    for (Ace ace : newACL.getAces()) {
+      String principal = ace.getPrincipal().getId();
       assertNotNull(principal);
 
       if (principal.equals("p1")) {
@@ -110,10 +110,10 @@ public class AclMergeTest extends TestCa
   /**
    * Creates an ACL structure from a Map.
    */
-  private AccessControlList createACL(Map<String, String[]> aceData) {
+  private Acl createACL(Map<String, String[]> aceData) {
     AccessControlListImpl result = new AccessControlListImpl();
 
-    List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+    List<Ace> aces = new ArrayList<Ace>();
 
     for (Map.Entry<String, String[]> e : aceData.entrySet()) {
       ArrayList<String> permissions = new ArrayList<String>();
@@ -137,12 +137,12 @@ public class AclMergeTest extends TestCa
    * A class to make a few protected methods publicly available.
    */
   private static class AtomPubService extends AbstractAtomPubService {
-    public AccessControlList publicMergeACLs(AccessControlList originalACEs,
-        AccessControlList addACEs, AccessControlList removeACEs) {
+    public Acl publicMergeACLs(Acl originalACEs,
+        Acl addACEs, Acl removeACEs) {
       return mergeAcls(originalACEs, addACEs, removeACEs);
     }
 
-    public boolean publicIsACLMergeRequired(AccessControlList addACEs, AccessControlList removeACEs) {
+    public boolean publicIsACLMergeRequired(Acl addACEs, Acl removeACEs) {
       return isAclMergeRequired(addACEs, removeACEs);
     }
   }

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -36,8 +36,8 @@ 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.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
@@ -449,8 +449,8 @@ public abstract class AbstractCmisTestCa
   protected ContentStream createContentStreamData(String mimeType, byte[] content) {
     assertNotNull(content);
 
-    return getObjectFactory().createContentStream(BigInteger.valueOf(content.length), mimeType,
-        "test", new ByteArrayInputStream(content));
+    return getObjectFactory().createContentStream("test", BigInteger.valueOf(content.length),
+        mimeType, new ByteArrayInputStream(content));
   }
 
   /**
@@ -604,7 +604,7 @@ public abstract class AbstractCmisTestCa
    * Creates a folder.
    */
   protected String createFolder(PropertiesData properties, String folderId, List<String> policies,
-      AccessControlList addACEs, AccessControlList removeACEs) {
+      Acl addACEs, Acl removeACEs) {
     String objectId = getBinding().getObjectService().createFolder(getTestRepositoryId(),
         properties, folderId, policies, addACEs, removeACEs, null);
     assertNotNull(objectId);
@@ -661,7 +661,7 @@ public abstract class AbstractCmisTestCa
    */
   protected String createDocument(PropertiesData properties, String folderId,
       ContentStream contentStream, VersioningState versioningState, List<String> policies,
-      AccessControlList addACEs, AccessControlList removeACEs) {
+      Acl addACEs, Acl removeACEs) {
     String objectId = getBinding().getObjectService().createDocument(getTestRepositoryId(),
         properties, folderId, contentStream, versioningState, policies, addACEs, removeACEs, null);
     assertNotNull(objectId);
@@ -759,7 +759,7 @@ public abstract class AbstractCmisTestCa
    */
   protected String createDocumentFromSource(String sourceId, PropertiesData properties,
       String folderId, VersioningState versioningState, List<String> policies,
-      AccessControlList addACEs, AccessControlList removeACEs) {
+      Acl addACEs, Acl removeACEs) {
     String objectId = getBinding().getObjectService().createDocumentFromSource(
         getTestRepositoryId(), sourceId, properties, folderId, versioningState, policies, addACEs,
         removeACEs, null);
@@ -1127,7 +1127,7 @@ public abstract class AbstractCmisTestCa
         .getAllowableActions().get(action));
   }
 
-  protected void assertEquals(AccessControlList expected, AccessControlList actual) {
+  protected void assertEquals(Acl expected, Acl actual) {
     if ((expected == null) && (actual == null)) {
       return;
     }
@@ -1160,7 +1160,7 @@ public abstract class AbstractCmisTestCa
     }
   }
 
-  protected void assertEquals(AccessControlEntry expected, AccessControlEntry actual) {
+  protected void assertEquals(Ace expected, Ace actual) {
     if ((expected == null) && (actual == null)) {
       return;
     }
@@ -1174,11 +1174,11 @@ public abstract class AbstractCmisTestCa
     }
 
     assertNotNull(expected.getPrincipal());
-    assertNotNull(expected.getPrincipal().getPrincipalId());
+    assertNotNull(expected.getPrincipal().getId());
     assertNotNull(actual.getPrincipal());
-    assertNotNull(actual.getPrincipal().getPrincipalId());
-    assertEquals("ACE Principal:", expected.getPrincipal().getPrincipalId(), actual.getPrincipal()
-        .getPrincipalId());
+    assertNotNull(actual.getPrincipal().getId());
+    assertEquals("ACE Principal:", expected.getPrincipal().getId(), actual.getPrincipal()
+        .getId());
 
     assertEqualLists(expected.getPermissions(), actual.getPermissions());
   }

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -30,7 +30,7 @@ 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.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -425,7 +425,7 @@ public abstract class AbstractSimpleRead
 
     // check ACLS
     if (supportsDiscoverACLs()) {
-      AccessControlList acl = getBinding().getAclService().getAcl(getTestRepositoryId(), objectId,
+      Acl acl = getBinding().getAclService().getAcl(getTestRepositoryId(), objectId,
           Boolean.FALSE, null);
 
       assertEquals(object.getAcl(), acl);

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -23,8 +23,8 @@ 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.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -114,16 +114,16 @@ public abstract class AbstractSimpleRead
 
     // apply an ACL
     if (supportsManageACLs()) {
-      AccessControlEntry ace = getObjectFactory().createAccessControlEntry(getUsername(),
+      Ace ace = getObjectFactory().createAccessControlEntry(getUsername(),
           Collections.singletonList("cmis:read"));
-      AccessControlList acl = getObjectFactory().createAccessControlList(
+      Acl acl = getObjectFactory().createAccessControlList(
           Collections.singletonList(ace));
 
-      AccessControlList newAcl = getBinding().getAclService().applyAcl(getTestRepositoryId(),
+      Acl newAcl = getBinding().getAclService().applyAcl(getTestRepositoryId(),
           docId, acl, null, getAclPropagation(), null);
       assertNotNull(newAcl);
 
-      AccessControlList readAcl = getBinding().getAclService().getAcl(getTestRepositoryId(),
+      Acl readAcl = getBinding().getAclService().getAcl(getTestRepositoryId(),
           docId, Boolean.FALSE, null);
       assertNotNull(readAcl);
 

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -29,8 +29,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
-import org.apache.chemistry.opencmis.client.api.Acl;
 import org.apache.chemistry.opencmis.client.api.AllowableActions;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.client.api.ObjectId;
@@ -45,6 +43,8 @@ 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.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -122,7 +122,7 @@ public abstract class AbstractPersistent
 
       // handle ACL
       if (objectData.getAcl() != null) {
-        acl = of.convertAcl(objectData.getAcl());
+        acl = objectData.getAcl();
       }
 
       // handle policies
@@ -236,7 +236,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#delete(boolean)
    */
   public void delete(boolean allVersions) {
@@ -246,7 +246,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#updateProperties()
    */
   public ObjectId updateProperties() {
@@ -286,7 +286,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#updateProperties(java.util.Map)
    */
   public ObjectId updateProperties(Map<String, ?> properties) {
@@ -331,7 +331,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getBaseType()
    */
   public ObjectType getBaseType() {
@@ -345,7 +345,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getBaseTypeId()
    */
   public BaseObjectTypeIds getBaseTypeId() {
@@ -359,7 +359,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getChangeToken()
    */
   public String getChangeToken() {
@@ -368,7 +368,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getCreatedBy()
    */
   public String getCreatedBy() {
@@ -377,7 +377,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getCreationDate()
    */
   public GregorianCalendar getCreationDate() {
@@ -386,7 +386,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getId()
    */
   public String getId() {
@@ -395,7 +395,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getLastModificationDate()
    */
   public GregorianCalendar getLastModificationDate() {
@@ -404,7 +404,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getLastModifiedBy()
    */
   public String getLastModifiedBy() {
@@ -413,7 +413,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getName()
    */
   public String getName() {
@@ -422,7 +422,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getProperties()
    */
   public List<Property<?>> getProperties() {
@@ -437,7 +437,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getProperty(java.lang.String)
    */
   @SuppressWarnings("unchecked")
@@ -453,7 +453,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getPropertyMultivalue(java.lang.String)
    */
   public <T> List<T> getPropertyMultivalue(String id) {
@@ -467,7 +467,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getPropertyValue(java.lang.String)
    */
   public <T> T getPropertyValue(String id) {
@@ -481,7 +481,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#setName(java.lang.String)
    */
   public void setName(String name) {
@@ -490,7 +490,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#setProperty(java.lang.String, java.lang.Object)
    */
   @SuppressWarnings("unchecked")
@@ -518,7 +518,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#setPropertyMultivalue(java.lang.String,
    * java.util.List)
    */
@@ -547,7 +547,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getType()
    */
   public ObjectType getType() {
@@ -564,7 +564,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getAllowableActions()
    */
   public AllowableActions getAllowableActions() {
@@ -581,7 +581,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getRenditions()
    */
   public List<Rendition> getRenditions() {
@@ -598,7 +598,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getAcl(boolean)
    */
   public Acl getAcl(boolean onlyBasicPermissions) {
@@ -606,13 +606,13 @@ public abstract class AbstractPersistent
 
     ObjectFactory of = getObjectFactory();
 
-    return of.convertAcl(getBinding().getAclService().getAcl(getRepositoryId(), objectId,
-        onlyBasicPermissions, null));
+    return getBinding().getAclService().getAcl(getRepositoryId(), objectId,
+        onlyBasicPermissions, null);
   }
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#applyAcl(java.util.List, java.util.List,
    * org.apache.opencmis.commons.enums.AclPropagation)
    */
@@ -621,13 +621,13 @@ public abstract class AbstractPersistent
 
     ObjectFactory of = getObjectFactory();
 
-    return of.convertAcl(getBinding().getAclService().applyAcl(getRepositoryId(), objectId,
-        of.convertAces(addAces), of.convertAces(removeAces), aclPropagation, null));
+    return getBinding().getAclService().applyAcl(getRepositoryId(), objectId,
+        of.convertAces(addAces), of.convertAces(removeAces), aclPropagation, null);
   }
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#addAcl(java.util.List,
    * org.apache.opencmis.commons.enums.AclPropagation)
    */
@@ -637,7 +637,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#removeAcl(java.util.List,
    * org.apache.opencmis.commons.enums.AclPropagation)
    */
@@ -647,7 +647,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getAcl()
    */
   public Acl getAcl() {
@@ -664,7 +664,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see
    * org.apache.opencmis.client.api.CmisObject#applyPolicy(org.apache.opencmis.client.api.ObjectId)
    */
@@ -680,7 +680,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see
    * org.apache.opencmis.client.api.CmisObject#removePolicy(org.apache.opencmis.client.api.ObjectId)
    */
@@ -696,7 +696,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getPolicies()
    */
   public List<Policy> getPolicies() {
@@ -713,7 +713,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getRelationships()
    */
   public List<Relationship> getRelationships() {
@@ -728,7 +728,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getRelationships(boolean,
    * org.apache.opencmis.commons.enums.RelationshipDirection,
    * org.apache.opencmis.client.api.objecttype.ObjectType,
@@ -784,7 +784,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#isChanged()
    */
   public boolean isChanged() {
@@ -812,7 +812,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#getRefreshTimestamp()
    */
   public long getRefreshTimestamp() {
@@ -827,7 +827,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see
    * org.apache.opencmis.client.api.CmisObject#refresh(org.apache.opencmis.client.api.OperationContext
    * )
@@ -854,7 +854,7 @@ public abstract class AbstractPersistent
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.api.CmisObject#refreshIfOld(long)
    */
   public void refreshIfOld(long durationInMillis) {

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.client.api.Document;
 import org.apache.chemistry.opencmis.client.api.ObjectId;
@@ -35,6 +34,7 @@ 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.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;

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=934455&r1=934454&r2=934455&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 15:34:36 2010
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.client.api.Document;
 import org.apache.chemistry.opencmis.client.api.FileableCmisObject;
@@ -41,6 +40,7 @@ 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.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
 import org.apache.chemistry.opencmis.commons.bindings.NavigationService;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentSessionImpl.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/PersistentSessionImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentSessionImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/PersistentSessionImpl.java Thu Apr 15 15:34:36 2010
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.chemistry.opencmis.client.api.Ace;
 import org.apache.chemistry.opencmis.client.api.ChangeEvent;
 import org.apache.chemistry.opencmis.client.api.CmisObject;
 import org.apache.chemistry.opencmis.client.api.Document;
@@ -52,6 +51,7 @@ 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.Ace;
 import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.DiscoveryService;



Mime
View raw message