chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r934455 [2/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
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/PersistentObjectFactoryImpl.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/repository/PersistentObjectFactoryImpl.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/repository/PersistentObjectFactoryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/PersistentObjectFactoryImpl.java Thu Apr 15 15:34:36 2010
@@ -30,8 +30,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;
@@ -42,10 +40,7 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.client.api.Rendition;
 import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
 import org.apache.chemistry.opencmis.client.api.repository.ObjectFactory;
-import org.apache.chemistry.opencmis.client.runtime.AceImpl;
-import org.apache.chemistry.opencmis.client.runtime.AclImpl;
 import org.apache.chemistry.opencmis.client.runtime.AllowableActionsImpl;
-import org.apache.chemistry.opencmis.client.runtime.ContentStreamImpl;
 import org.apache.chemistry.opencmis.client.runtime.PersistentDocumentImpl;
 import org.apache.chemistry.opencmis.client.runtime.PersistentFolderImpl;
 import org.apache.chemistry.opencmis.client.runtime.PersistentPolicyImpl;
@@ -74,8 +69,8 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.PropertyUriDefinition;
 import org.apache.chemistry.opencmis.commons.api.RelationshipTypeDefinition;
 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.ContentStream;
@@ -87,6 +82,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.enums.Cardinality;
 import org.apache.chemistry.opencmis.commons.enums.Updatability;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 
 /**
  * Persistent model object factory.
@@ -154,36 +150,16 @@ public class PersistentObjectFactoryImpl
   /*
    * (non-Javadoc)
    *
-   * @see org.apache.opencmis.client.api.repository.ObjectFactory#createAce(java.lang.String,
-   * java.util.List, boolean)
-   */
-  public Ace createAce(String principalId, List<String> permissions, boolean isDirect) {
-    return new AceImpl(principalId, permissions, isDirect);
-  }
-
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.apache.opencmis.client.api.repository.ObjectFactory#createAcl(java.util.List,
-   * java.lang.Boolean)
-   */
-  public Acl createAcl(List<Ace> aces, Boolean isExact) {
-    return new AclImpl(aces, isExact);
-  }
-
-  /*
-   * (non-Javadoc)
-   *
    * @see org.apache.opencmis.client.api.repository.ObjectFactory#convertAces(java.util.List)
    */
-  public AccessControlList convertAces(List<Ace> aces) {
+  public Acl convertAces(List<Ace> aces) {
     if (aces == null) {
       return null;
     }
 
     BindingsObjectFactory pof = getProviderObjectFactory();
 
-    List<AccessControlEntry> providerAces = new ArrayList<AccessControlEntry>();
+    List<Ace> providerAces = new ArrayList<Ace>();
     for (Ace ace : aces) {
       providerAces.add(pof.createAccessControlEntry(ace.getPrincipalId(), ace.getPermissions()));
     }
@@ -191,32 +167,6 @@ public class PersistentObjectFactoryImpl
     return pof.createAccessControlList(providerAces);
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see
-   * org.apache.opencmis.client.api.repository.ObjectFactory#convertAcl(org.apache.opencmis.commons
-   * .provider.AccessControlList)
-   */
-  public Acl convertAcl(AccessControlList acl) {
-    if (acl == null) {
-      throw new IllegalArgumentException("ACL must be set!");
-    }
-
-    List<Ace> aces = new ArrayList<Ace>();
-    if (acl.getAces() != null) {
-      for (AccessControlEntry ace : acl.getAces()) {
-        if (ace.getPrincipal() == null) {
-          continue;
-        }
-        aces.add(createAce(ace.getPrincipal().getPrincipalId(), ace.getPermissions(), ace
-            .isDirect()));
-      }
-    }
-
-    return createAcl(aces, acl.isExact());
-  }
-
   // policies
 
   /*
@@ -274,7 +224,7 @@ public class PersistentObjectFactoryImpl
    */
   public ContentStream createContentStream(String filename, long length, String mimetype,
       InputStream stream) {
-    return new ContentStreamImpl(filename, length, mimetype, stream);
+    return new ContentStreamImpl(filename, BigInteger.valueOf(length), mimetype, stream);
   }
 
   /*
@@ -292,8 +242,8 @@ public class PersistentObjectFactoryImpl
     BigInteger length = (contentStream.getLength() < 0 ? null : BigInteger.valueOf(contentStream
         .getLength()));
 
-    return getProviderObjectFactory().createContentStream(length, contentStream.getMimeType(),
-        contentStream.getFileName(), contentStream.getStream());
+    return getProviderObjectFactory().createContentStream(contentStream.getFileName(), length,
+        contentStream.getMimeType(), contentStream.getStream());
   }
 
   // types

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java (from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlEntry.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlEntry.java&r1=934418&r2=934455&rev=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlEntry.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java Thu Apr 15 15:34:36 2010
@@ -24,11 +24,13 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
-public interface AccessControlEntry extends ExtensionsData {
+public interface Ace extends ExtensionsData {
 
-  AccessControlPrincipalData getPrincipal();
+  Principal getPrincipal();
+
+  String getPrincipalId();
 
   List<String> getPermissions();
 

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Ace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java (from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlList.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlList.java&r1=934418&r2=934455&rev=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlList.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java Thu Apr 15 15:34:36 2010
@@ -26,9 +26,9 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public interface AccessControlList extends ExtensionsData {
+public interface Acl extends ExtensionsData {
 
-  List<AccessControlEntry> getAces();
+  List<Ace> getAces();
 
   Boolean isExact();
 }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Acl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AclService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AclService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AclService.java Thu Apr 15 15:34:36 2010
@@ -31,9 +31,9 @@ import org.apache.chemistry.opencmis.com
  */
 public interface AclService {
 
-  AccessControlList getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions,
+  Acl getAcl(String repositoryId, String objectId, Boolean onlyBasicPermissions,
       ExtensionsData extension);
 
-  AccessControlList applyAcl(String repositoryId, String objectId, AccessControlList addAces,
-      AccessControlList removeAces, AclPropagation aclPropagation, ExtensionsData extension);
+  Acl applyAcl(String repositoryId, String objectId, Acl addAces,
+      Acl removeAces, AclPropagation aclPropagation, ExtensionsData extension);
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/BindingsObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/BindingsObjectFactory.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/BindingsObjectFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/BindingsObjectFactory.java Thu Apr 15 15:34:36 2010
@@ -32,9 +32,9 @@ import java.util.List;
  */
 public interface BindingsObjectFactory {
 
-  AccessControlEntry createAccessControlEntry(String principal, List<String> permissions);
+  Ace createAccessControlEntry(String principal, List<String> permissions);
 
-  AccessControlList createAccessControlList(List<AccessControlEntry> aces);
+  Acl createAccessControlList(List<Ace> aces);
 
   PropertyBooleanData createPropertyBooleanData(String id, List<Boolean> values);
 
@@ -70,6 +70,6 @@ public interface BindingsObjectFactory {
 
   PropertiesData createPropertiesData(List<PropertyData<?>> properties);
 
-  ContentStream createContentStream(BigInteger length, String mimetype, String filename,
+  ContentStream createContentStream(String filename, BigInteger length, String mimetype,
       InputStream stream);
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java Thu Apr 15 15:34:36 2010
@@ -79,7 +79,7 @@ public interface ObjectData extends Exte
    * 
    * @return the access control list or <code>null</code> if the access control list is unknown
    */
-  AccessControlList getAcl();
+  Acl getAcl();
 
   /**
    * Returns if the access control list reflects the exact permission set in the repository.

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java Thu Apr 15 15:34:36 2010
@@ -38,21 +38,21 @@ public interface ObjectService {
 
   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);
 
   String createDocumentFromSource(String repositoryId, String sourceId, PropertiesData properties,
       String folderId, VersioningState versioningState, List<String> policies,
-      AccessControlList addAces, AccessControlList removeAces, ExtensionsData extension);
+      Acl addAces, Acl removeAces, ExtensionsData extension);
 
   String createFolder(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension);
 
   String createRelationship(String repositoryId, PropertiesData properties, List<String> policies,
-      AccessControlList addAces, AccessControlList removeAces, ExtensionsData extension);
+      Acl addAces, Acl removeAces, ExtensionsData extension);
 
   String createPolicy(String repositoryId, PropertiesData properties, String folderId,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension);
 
   AllowableActionsData getAllowableActions(String repositoryId, String objectId,

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java (from r934418, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlPrincipalData.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlPrincipalData.java&r1=934418&r2=934455&rev=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AccessControlPrincipalData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java Thu Apr 15 15:34:36 2010
@@ -24,8 +24,8 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public interface AccessControlPrincipalData extends ExtensionsData {
+public interface Principal extends ExtensionsData {
 
-  String getPrincipalId();
+  String getId();
 
 }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/Principal.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/VersioningService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/VersioningService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/VersioningService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/VersioningService.java Thu Apr 15 15:34:36 2010
@@ -39,7 +39,7 @@ public interface VersioningService {
 
   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);
 
   public ObjectData getObjectOfLatestVersion(String repositoryId, String versionSeriesId,

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java Thu Apr 15 15:34:36 2010
@@ -55,8 +55,8 @@ 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.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.AclCapabilities;
 import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
@@ -110,7 +110,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AllowableActionsDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ChangeEventInfoDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ChoiceImpl;
-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.DocumentTypeDefinitionImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ExtensionDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.FailedToDeleteDataImpl;
@@ -1663,14 +1663,14 @@ public final class Converter {
   /**
    * Converts an ACL object with its ACEs.
    */
-  public static AccessControlList convert(CmisAccessControlListType acl, Boolean isExact) {
+  public static Acl convert(CmisAccessControlListType acl, Boolean isExact) {
     if (acl == null) {
       return null;
     }
 
     AccessControlListImpl result = new AccessControlListImpl();
 
-    List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+    List<Ace> aces = new ArrayList<Ace>();
     for (CmisAccessControlEntryType entry : acl.getPermission()) {
       if (entry == null) {
         continue;
@@ -1703,7 +1703,7 @@ public final class Converter {
   /**
    * Converts an ACL object with its ACEs.
    */
-  public static CmisAccessControlListType convert(AccessControlList acl) {
+  public static CmisAccessControlListType convert(Acl acl) {
     if (acl == null) {
       return null;
     }
@@ -1711,7 +1711,7 @@ public final class Converter {
     CmisAccessControlListType result = new CmisAccessControlListType();
 
     if (acl.getAces() != null) {
-      for (AccessControlEntry ace : acl.getAces()) {
+      for (Ace ace : acl.getAces()) {
         if (ace == null) {
           continue;
         }
@@ -1721,7 +1721,7 @@ public final class Converter {
         if (ace.getPrincipal() != null) {
           CmisAccessControlPrincipalType pincipal = new CmisAccessControlPrincipalType();
 
-          pincipal.setPrincipalId(ace.getPrincipal().getPrincipalId());
+          pincipal.setPrincipalId(ace.getPrincipal().getId());
           convertExtension(pincipal, ace.getPrincipal());
 
           entry.setPrincipal(pincipal);
@@ -2308,8 +2308,8 @@ public final class Converter {
   /**
    * Converts an access control list object.
    */
-  public static AccessControlList convert(CmisACLType acl) {
-    AccessControlList result = convert(acl.getACL(), acl.isExact());
+  public static Acl convert(CmisACLType acl) {
+    Acl result = convert(acl.getACL(), acl.isExact());
 
     // handle extensions
     convertExtension(acl, result);
@@ -2369,7 +2369,7 @@ public final class Converter {
       return null;
     }
 
-    ContentStreamDataImpl result = new ContentStreamDataImpl();
+    ContentStreamImpl result = new ContentStreamImpl();
 
     result.setFileName(contentStream.getFilename());
     result.setLength(contentStream.getLength());

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java Thu Apr 15 15:34:36 2010
@@ -20,19 +20,19 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry;
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlPrincipalData;
+import org.apache.chemistry.opencmis.commons.bindings.Ace;
+import org.apache.chemistry.opencmis.commons.bindings.Principal;
 
 /**
  * Access Control Entry data implementation.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
-public class AccessControlEntryImpl extends AbstractExtensionData implements AccessControlEntry {
+public class AccessControlEntryImpl extends AbstractExtensionData implements Ace {
 
   private List<String> fPermissions;
-  private AccessControlPrincipalData fPrincipal;
+  private Principal fPrincipal;
   private boolean fIsDirect = true;
 
   /**
@@ -44,27 +44,31 @@ public class AccessControlEntryImpl exte
   /**
    * Constructor.
    */
-  public AccessControlEntryImpl(AccessControlPrincipalData principal, List<String> permissions) {
+  public AccessControlEntryImpl(Principal principal, List<String> permissions) {
     setPrincipal(principal);
     setPermissions(permissions);
   }
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.AccessControlEntry#getPrincipal()
    */
-  public AccessControlPrincipalData getPrincipal() {
+  public Principal getPrincipal() {
     return fPrincipal;
   }
 
-  public void setPrincipal(AccessControlPrincipalData principal) {
+  public String getPrincipalId() {
+    return fPrincipal == null ? null : fPrincipal.getId();
+  }
+
+  public void setPrincipal(Principal principal) {
     fPrincipal = principal;
   }
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.AccessControlEntry#getPermissions()
    */
   public List<String> getPermissions() {
@@ -77,7 +81,7 @@ public class AccessControlEntryImpl exte
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.AccessControlEntry#isDirect()
    */
   public boolean isDirect() {
@@ -90,7 +94,7 @@ public class AccessControlEntryImpl exte
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see java.lang.Object#toString()
    */
   @Override

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java Thu Apr 15 15:34:36 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-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;
 
 /**
  * Access control list data implementation.
@@ -29,9 +29,9 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class AccessControlListImpl extends AbstractExtensionData implements AccessControlList {
+public class AccessControlListImpl extends AbstractExtensionData implements Acl {
 
-  private List<AccessControlEntry> fAces;
+  private List<Ace> fAces;
   private Boolean fIsExact;
 
   /**
@@ -43,7 +43,7 @@ public class AccessControlListImpl exten
   /**
    * Constructor.
    */
-  public AccessControlListImpl(List<AccessControlEntry> aces) {
+  public AccessControlListImpl(List<Ace> aces) {
     setAces(aces);
   }
 
@@ -52,11 +52,11 @@ public class AccessControlListImpl exten
    * 
    * @see org.apache.opencmis.client.provider.AccessControlList#getACEs()
    */
-  public List<AccessControlEntry> getAces() {
+  public List<Ace> getAces() {
     return fAces;
   }
 
-  public void setAces(List<AccessControlEntry> aces) {
+  public void setAces(List<Ace> aces) {
     fAces = aces;
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java Thu Apr 15 15:34:36 2010
@@ -18,14 +18,14 @@
  */
 package org.apache.chemistry.opencmis.commons.impl.dataobjects;
 
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlPrincipalData;
+import org.apache.chemistry.opencmis.commons.bindings.Principal;
 
 /**
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
 public class AccessControlPrincipalDataImpl extends AbstractExtensionData implements
-    AccessControlPrincipalData {
+    Principal {
 
   private String fPrincipalId;
 
@@ -47,7 +47,7 @@ public class AccessControlPrincipalDataI
    * 
    * @see org.apache.opencmis.client.provider.AccessControlPrincipalData#getPrincipalId()
    */
-  public String getPrincipalId() {
+  public String getId() {
     return fPrincipalId;
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java Thu Apr 15 15:34:36 2010
@@ -25,8 +25,8 @@ import java.math.BigInteger;
 import java.util.GregorianCalendar;
 import java.util.List;
 
-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.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
@@ -42,9 +42,9 @@ import org.apache.chemistry.opencmis.com
 
 /**
  * CMIS binding object factory implementation.
- * 
+ *
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
 public class BindingsObjectFactoryImpl implements BindingsObjectFactory, Serializable {
 
@@ -53,17 +53,17 @@ public class BindingsObjectFactoryImpl i
   public BindingsObjectFactoryImpl() {
   }
 
-  public AccessControlEntry createAccessControlEntry(String principal, List<String> permissions) {
+  public Ace createAccessControlEntry(String principal, List<String> permissions) {
     return new AccessControlEntryImpl(new AccessControlPrincipalDataImpl(principal), permissions);
   }
 
-  public AccessControlList createAccessControlList(List<AccessControlEntry> aces) {
+  public Acl createAccessControlList(List<Ace> aces) {
     return new AccessControlListImpl(aces);
   }
 
-  public ContentStream createContentStream(BigInteger length, String mimetype, String filename,
+  public ContentStream createContentStream(String filename, BigInteger length, String mimetype,
       InputStream stream) {
-    return new ContentStreamDataImpl(length, mimetype, filename, stream);
+    return new ContentStreamImpl(filename, length, mimetype, stream);
   }
 
   public PropertiesData createPropertiesData(List<PropertyData<?>> properties) {

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java (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)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java&r1=934426&r2=934455&rev=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java Thu Apr 15 15:34:36 2010
@@ -29,7 +29,7 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  *
  */
-public class ContentStreamDataImpl extends AbstractExtensionData implements ContentStream {
+public class ContentStreamImpl extends AbstractExtensionData implements ContentStream {
 
   private String fFilename;
   private BigInteger fLength;
@@ -39,14 +39,14 @@ public class ContentStreamDataImpl exten
   /**
    * Constructor.
    */
-  public ContentStreamDataImpl() {
+  public ContentStreamImpl() {
   }
 
   /**
    * Constructor.
    */
-  public ContentStreamDataImpl(BigInteger length, String mimetype, String filename,
-      InputStream stream) {
+  public ContentStreamImpl(String filename, BigInteger length,
+          String mimetype, InputStream stream) {
     setLength(length);
     setMimeType(mimetype);
     setFileName(filename);

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java Thu Apr 15 15:34:36 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
 import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-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.ChangeEventInfoData;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -43,7 +43,7 @@ public class ObjectDataImpl extends Abst
   private List<RenditionData> fRenditions;
   private PolicyIdListData fPolicyIds;
   private AllowableActionsData fAllowableActions;
-  private AccessControlList fAcl;
+  private Acl fAcl;
   private Boolean fIsExactAcl;
 
   /*
@@ -161,11 +161,11 @@ public class ObjectDataImpl extends Abst
    * 
    * @see org.apache.opencmis.client.provider.ObjectData#getACL()
    */
-  public AccessControlList getAcl() {
+  public Acl getAcl() {
     return fAcl;
   }
 
-  public void setAcl(AccessControlList acl) {
+  public void setAcl(Acl acl) {
     fAcl = acl;
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java Thu Apr 15 15:34:36 2010
@@ -25,7 +25,7 @@ import java.io.OutputStream;
 import javax.xml.bind.JAXBException;
 import javax.xml.stream.XMLStreamException;
 
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAccessControlListType;
 
@@ -46,7 +46,7 @@ public class AclDocument {
   /**
    * Writes an object.
    */
-  public void writeAcl(AccessControlList acl, OutputStream out) throws XMLStreamException,
+  public void writeAcl(Acl acl, OutputStream out) throws XMLStreamException,
       JAXBException {
     CmisAccessControlListType aclJaxb = convert(acl);
     if (aclJaxb == null) {

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java Thu Apr 15 15:34:36 2010
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRes
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.Unmarshaller;
 
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
@@ -61,7 +61,7 @@ public class AclService {
         Constants.PARAM_ONLY_BASIC_PERMISSIONS);
 
     // execute
-    AccessControlList acl = service.getAcl(context, repositoryId, objectId, onlyBasicPermissions,
+    Acl acl = service.getAcl(context, repositoryId, objectId, onlyBasicPermissions,
         null);
 
     if (acl == null) {
@@ -107,11 +107,11 @@ public class AclService {
       throw new CmisInvalidArgumentException("Not an ACL document!");
     }
 
-    AccessControlList aces = convert((CmisAccessControlListType) ((JAXBElement<?>) aclRequest)
+    Acl aces = convert((CmisAccessControlListType) ((JAXBElement<?>) aclRequest)
         .getValue(), null);
 
     // execute
-    AccessControlList acl = service.applyAcl(context, repositoryId, objectId, aces, aclPropagation);
+    Acl acl = service.applyAcl(context, repositoryId, objectId, aces, aclPropagation);
 
     // set headers
     response.setStatus(HttpServletResponse.SC_CREATED);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java Thu Apr 15 15:34:36 2010
@@ -34,7 +34,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-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.ObjectData;
 import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
@@ -46,7 +46,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.Constants;
 import org.apache.chemistry.opencmis.commons.impl.Converter;
 import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
-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.PropertiesDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType;
@@ -71,8 +71,8 @@ public class AtomEntryParser {
   private final static String ATTR_TYPE = "type";
 
   private ObjectData fObject;
-  private ContentStreamDataImpl fAtomContentStream;
-  private ContentStreamDataImpl fCmisContentStream;
+  private ContentStreamImpl fAtomContentStream;
+  private ContentStreamImpl fCmisContentStream;
 
   /**
    * Constructor.
@@ -126,7 +126,7 @@ public class AtomEntryParser {
   /**
    * Returns the ACL of the object.
    */
-  public AccessControlList getAcl() {
+  public Acl getAcl() {
     return (fObject == null ? null : fObject.getAcl());
   }
 
@@ -259,7 +259,7 @@ public class AtomEntryParser {
    * Extract the content stream.
    */
   private void parseAtomContent(XMLStreamReader parser) throws Exception {
-    fAtomContentStream = new ContentStreamDataImpl();
+    fAtomContentStream = new ContentStreamImpl();
 
     // read attributes
     String type = "text";
@@ -297,7 +297,7 @@ public class AtomEntryParser {
    * Extract the content stream.
    */
   private void parseCmisContent(XMLStreamReader parser) throws Exception {
-    fCmisContentStream = new ContentStreamDataImpl();
+    fCmisContentStream = new ContentStreamImpl();
 
     next(parser);
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java Thu Apr 15 15:34:36 2010
@@ -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.server.impl.ObjectInfoHolderImpl;
 import org.apache.chemistry.opencmis.server.spi.AbstractServicesFactory;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
@@ -219,7 +219,7 @@ public final class ObjectService {
     String changeToken = getStringParameter(request, Constants.PARAM_CHANGE_TOKEN);
     Boolean overwriteFlag = getBooleanParameter(request, Constants.PARAM_OVERWRITE_FLAG);
 
-    ContentStreamDataImpl contentStream = new ContentStreamDataImpl();
+    ContentStreamImpl contentStream = new ContentStreamImpl();
     contentStream.setStream(request.getInputStream());
     contentStream.setMimeType(request.getHeader("Content-Type"));
     String lengthStr = request.getHeader("Content-Length");

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/AclService.java Thu Apr 15 15:34:36 2010
@@ -24,7 +24,7 @@ import javax.annotation.Resource;
 import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
 
-import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.ACLServicePort;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisACLType;
@@ -55,7 +55,7 @@ public class AclService extends Abstract
       CmisAclService service = factory.getAclService();
       CallContext context = createContext(fContext);
 
-      AccessControlList acl = service.applyAcl(context, repositoryId, objectId, convert(addAces,
+      Acl acl = service.applyAcl(context, repositoryId, objectId, convert(addAces,
           null), convert(removeAces, null), convert(AclPropagation.class, aclPropagation),
           convert(extension));
 
@@ -81,7 +81,7 @@ public class AclService extends Abstract
       CmisAclService service = factory.getAclService();
       CallContext context = createContext(fContext);
 
-      AccessControlList acl = service.getAcl(context, repositoryId, objectId, onlyBasicPermissions,
+      Acl acl = service.getAcl(context, repositoryId, objectId, onlyBasicPermissions,
           convert(extension));
 
       if (acl == null) {

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/AclService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/AclService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/AclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/AclService.java Thu Apr 15 15:34:36 2010
@@ -19,7 +19,7 @@
 package org.apache.chemistry.opencmis.fileshare;
 
 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.enums.AclPropagation;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
@@ -50,8 +50,8 @@ public class AclService implements CmisA
    * , java.lang.String, java.lang.String, org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.enums.AclPropagation)
    */
-  public AccessControlList applyAcl(CallContext context, String repositoryId, String objectId,
-      AccessControlList aces, AclPropagation aclPropagation) {
+  public Acl applyAcl(CallContext context, String repositoryId, String objectId,
+      Acl aces, AclPropagation aclPropagation) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
     throw new CmisNotSupportedException("applyAcl not supported!");
   }
@@ -66,8 +66,8 @@ public class AclService implements CmisA
    * org.apache.opencmis.commons.enums.AclPropagation,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public AccessControlList applyAcl(CallContext context, String repositoryId, String objectId,
-      AccessControlList addAces, AccessControlList removeAces, AclPropagation aclPropagation,
+  public Acl applyAcl(CallContext context, String repositoryId, String objectId,
+      Acl addAces, Acl removeAces, AclPropagation aclPropagation,
       ExtensionsData extension) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
     throw new CmisNotSupportedException("applyAcl not supported!");
@@ -81,7 +81,7 @@ public class AclService implements CmisA
    * , java.lang.String, java.lang.String, java.lang.Boolean,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  public AccessControlList getAcl(CallContext context, String repositoryId, String objectId,
+  public Acl getAcl(CallContext context, String repositoryId, String objectId,
       Boolean onlyBasicPermissions, ExtensionsData extension) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).getAcl(context,
         objectId, objectId);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Thu Apr 15 15:34:36 2010
@@ -49,8 +49,8 @@ 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.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.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
@@ -97,7 +97,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlPrincipalDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AclCapabilitiesDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AllowableActionsDataImpl;
-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.dataobjects.ObjectDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectInFolderContainerImpl;
@@ -914,7 +914,7 @@ public class FileShareRepository {
   /**
    * CMIS getACL.
    */
-  public AccessControlList getAcl(CallContext context, String repositoryId, String objectId) {
+  public Acl getAcl(CallContext context, String repositoryId, String objectId) {
     debug("getAcl");
     checkUser(context, false);
 
@@ -954,7 +954,7 @@ public class FileShareRepository {
     }
 
     // compile data
-    ContentStreamDataImpl result = new ContentStreamDataImpl();
+    ContentStreamImpl result = new ContentStreamImpl();
     result.setFileName(file.getName());
     result.setLength(BigInteger.valueOf(file.length()));
     result.setMimeType(MIMETypes.getMIMEType(file));
@@ -1881,9 +1881,9 @@ public class FileShareRepository {
   /**
    * Compiles the ACL for a file or folder.
    */
-  private AccessControlList compileAcl(File file) {
+  private Acl compileAcl(File file) {
     AccessControlListImpl result = new AccessControlListImpl();
-    result.setAces(new ArrayList<AccessControlEntry>());
+    result.setAces(new ArrayList<Ace>());
 
     for (Map.Entry<String, Boolean> ue : fUserMap.entrySet()) {
       // create principal

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java Thu Apr 15 15:34:36 2010
@@ -23,7 +23,7 @@ import java.util.Collections;
 import java.util.List;
 
 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;
@@ -88,7 +88,7 @@ public class ObjectService implements Cm
    */
   public String createDocument(CallContext context, String repositoryId, PropertiesData properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).createDocument(context,
         properties, folderId, contentStream, versioningState);
@@ -108,7 +108,7 @@ public class ObjectService implements Cm
    */
   public String createDocumentFromSource(CallContext context, 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) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId)
         .createDocumentFromSource(context, sourceId, properties, folderId, versioningState);
@@ -125,8 +125,8 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public String createFolder(CallContext context, String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).createFolder(context,
         properties, folderId);
   }
@@ -142,8 +142,8 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public String createPolicy(CallContext context, String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
     throw new CmisNotSupportedException("createPolicy not supported!");
   }
@@ -159,8 +159,8 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public String createRelationship(CallContext context, String repositoryId,
-      PropertiesData properties, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      PropertiesData properties, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
     throw new CmisNotSupportedException("createRelationship not supported!");
   }
@@ -351,7 +351,7 @@ public class ObjectService implements Cm
    */
   public ObjectData updateProperties(CallContext context, String repositoryId,
       Holder<String> objectId, Holder<String> changeToken, PropertiesData properties,
-      AccessControlList acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
+      Acl acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).updateProperties(
         context, objectId, properties, objectInfos);
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java Thu Apr 15 15:34:36 2010
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.List;
 
 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;
@@ -78,8 +78,8 @@ public class VersioningService implement
    */
   public ObjectData checkIn(CallContext context, String repositoryId, Holder<String> objectId,
       Boolean major, PropertiesData properties, ContentStream contentStream,
-      String checkinComment, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
+      String checkinComment, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
     throw new CmisNotSupportedException("checkIn not supported!");
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Thu Apr 15 15:34:36 2010
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-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.ChangeEventInfoData;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -123,9 +123,9 @@ public class DataObjectCreator {
     return allowableActions;
   }
 
-  public static AccessControlList fillACL(StoredObject so) {
+  public static Acl fillACL(StoredObject so) {
     AccessControlListImpl acl = new AccessControlListImpl();
-    List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+    List<Ace> aces = new ArrayList<Ace>();
     // TODO to be completed if ACLs are implemented
     acl.setAces(aces);
     return acl;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -23,7 +23,7 @@ import java.math.BigInteger;
 import java.util.List;
 
 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;
@@ -47,35 +47,35 @@ 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) {
     
     return fObjSvc.createDocument(fDummyCallContext, repositoryId, properties, folderId, contentStream, versioningState, policies, addAces, removeAces, extension);
   }
 
   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) {
     
     return fObjSvc.createDocumentFromSource(fDummyCallContext, repositoryId, sourceId, properties, folderId, versioningState, policies, addAces, removeAces, extension);
   }
 
   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) {
     
     return fObjSvc.createFolder(fDummyCallContext, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
   }
 
   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) {
     
     return fObjSvc.createPolicy(fDummyCallContext, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
   }
 
   public String createRelationship(String repositoryId, PropertiesData properties,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     
     return fObjSvc.createRelationship(fDummyCallContext, repositoryId, properties, policies, addAces, removeAces, extension);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.in
 import java.util.List;
 
 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;
@@ -45,7 +45,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) {
 
     fVersioningSvc.checkIn(fDummyCallContext, repositoryId, objectId, major, properties,

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -29,7 +29,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
-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;
@@ -86,7 +86,7 @@ public class InMemoryObjectServiceImpl e
 
   public String createDocument(CallContext context, String repositoryId, PropertiesData properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
 
     try {
@@ -106,7 +106,7 @@ public class InMemoryObjectServiceImpl e
 
   public String createDocumentFromSource(CallContext context, 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) {
 
     try {
@@ -150,8 +150,8 @@ public class InMemoryObjectServiceImpl e
   }
 
   public String createFolder(CallContext context, String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
     try {
       LOG.debug("start createFolder()");
       RuntimeContext.attachCfg(context);
@@ -167,8 +167,8 @@ public class InMemoryObjectServiceImpl e
   }
 
   public String createPolicy(CallContext context, String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
 
     try {
       // Attach the CallContext to a thread local context that can be accessed from everywhere
@@ -188,8 +188,8 @@ public class InMemoryObjectServiceImpl e
   }
 
   public String createRelationship(CallContext context, String repositoryId,
-      PropertiesData properties, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      PropertiesData properties, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
 
     try {
       // Attach the CallContext to a thread local context that can be accessed from everywhere
@@ -649,7 +649,7 @@ public class InMemoryObjectServiceImpl e
 
   public ObjectData updateProperties(CallContext context, String repositoryId,
       Holder<String> objectId, Holder<String> changeToken, PropertiesData properties,
-      AccessControlList acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
+      Acl acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
 
     try {
       // Attach the CallContext to a thread local context that can be accessed from everywhere
@@ -778,7 +778,7 @@ public class InMemoryObjectServiceImpl e
 
   private StoredObject createDocumentIntern(String repositoryId, PropertiesData properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
-      List<String> policies, AccessControlList addACEs, AccessControlList removeACEs,
+      List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
     checkRepositoryId(repositoryId);
 
@@ -863,8 +863,8 @@ public class InMemoryObjectServiceImpl e
   }
 
   private Folder createFolderIntern(String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
 
     // Attach the CallContext to a thread local context that can be accessed from everywhere
     checkStandardParameters(repositoryId, folderId);
@@ -928,13 +928,13 @@ public class InMemoryObjectServiceImpl e
   }
 
   private StoredObject createPolicyIntern(String repositoryId, PropertiesData properties,
-      String folderId, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension) {
+      String folderId, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension) {
     return null;
   }
 
   private StoredObject createRelationshipIntern(String repositoryId, PropertiesData properties,
-      List<String> policies, AccessControlList addAces, AccessControlList removeAces,
+      List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     return null;
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Thu Apr 15 15:34:36 2010
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.chemistry.opencmis.commons.api.DocumentTypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
 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.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
 import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -81,8 +81,8 @@ public class InMemoryVersioningServiceIm
 
   public ObjectData checkIn(CallContext context, String repositoryId, Holder<String> objectId,
       Boolean major, PropertiesData properties, ContentStream contentStream,
-      String checkinComment, List<String> policies, AccessControlList addAces,
-      AccessControlList removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
+      String checkinComment, List<String> policies, Acl addAces,
+      Acl removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
 
     try {
       // Attach the CallContext to a thread local context that can be accessed from everywhere

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java Thu Apr 15 15:34:36 2010
@@ -18,7 +18,7 @@ import org.apache.chemistry.opencmis.cli
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.SessionParameter;
 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.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
@@ -142,8 +142,8 @@ public class AbstractServiceTst /* exten
   protected String createDocument(String name, String folderId, String typeId, VersioningState versioningState, boolean withContent) {
     ContentStream contentStream = null;
     List<String> policies = null;
-    AccessControlList addACEs = null;
-    AccessControlList removeACEs = null;
+    Acl addACEs = null;
+    Acl removeACEs = null;
     ExtensionsData extension = null;
 
     PropertiesData props = createDocumentProperties(name, typeId);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java?rev=934455&r1=934454&r2=934455&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java Thu Apr 15 15:34:36 2010
@@ -30,7 +30,7 @@ import java.util.Map.Entry;
 
 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.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
 import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -39,7 +39,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
 import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 
 public class ObjectCreator {
 
@@ -56,8 +56,8 @@ public class ObjectCreator {
   public String createDocument(String name, String typeId, String folderId, VersioningState versioningState, Map<String, String> propsToSet) {
     ContentStream contentStream = null;
     List<String> policies = null;
-    AccessControlList addACEs = null;
-    AccessControlList removeACEs = null;
+    Acl addACEs = null;
+    Acl removeACEs = null;
     ExtensionsData extension = null;
 
     PropertiesData props = createStringDocumentProperties(name, typeId, propsToSet);
@@ -86,7 +86,7 @@ public class ObjectCreator {
   }
 
   public ContentStream createContent() {
-    ContentStreamDataImpl content = new ContentStreamDataImpl();
+    ContentStreamImpl content = new ContentStreamImpl();
     content.setFileName("data.txt");
     content.setMimeType("text/plain");
     int len = 32 * 1024;
@@ -108,7 +108,7 @@ public class ObjectCreator {
   }
 
   public ContentStream createAlternateContent() {
-    ContentStreamDataImpl content = new ContentStreamDataImpl();
+    ContentStreamImpl content = new ContentStreamImpl();
     content.setFileName("data.txt");
     content.setMimeType("text/plain");
     int len = 32 * 1024;



Mime
View raw message