Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.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/ObjectServiceTest.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/ObjectServiceTest.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.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.ExtensionsData; 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.AllowableActionsData; import org.apache.chemistry.opencmis.commons.bindings.ContentStream; import org.apache.chemistry.opencmis.commons.bindings.Holder; @@ -814,8 +814,8 @@ public class ObjectServiceTest extends A ContentStream contentStream = null; VersioningState versioningState = VersioningState.NONE; List<String> policies = null; - AccessControlList addACEs = null; - AccessControlList removeACEs = null; + Acl addACEs = null; + Acl removeACEs = null; ExtensionsData extension = null; // create the properties: @@ -844,8 +844,8 @@ public class ObjectServiceTest extends A ContentStream contentStream = null; VersioningState versioningState = VersioningState.NONE; List<String> policies = null; - AccessControlList addACEs = null; - AccessControlList removeACEs = null; + Acl addACEs = null; + Acl removeACEs = null; ExtensionsData extension = null; // create the properties:
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java Thu Apr 15 15:34:36 2010 @@ -19,7 +19,7 @@ package org.apache.chemistry.opencmis.server.spi; 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; /** @@ -38,7 +38,7 @@ public interface CmisAclService { * Bindings: AtomPub, Web Services * </p> */ - AccessControlList getAcl(CallContext context, String repositoryId, String objectId, + Acl getAcl(CallContext context, String repositoryId, String objectId, Boolean onlyBasicPermissions, ExtensionsData extension); /** @@ -48,8 +48,8 @@ public interface CmisAclService { * Bindings: Web Services * </p> */ - AccessControlList applyAcl(CallContext context, String repositoryId, String objectId, - AccessControlList addAces, AccessControlList removeAces, AclPropagation aclPropagation, + Acl applyAcl(CallContext context, String repositoryId, String objectId, + Acl addAces, Acl removeAces, AclPropagation aclPropagation, ExtensionsData extension); /** @@ -61,6 +61,6 @@ public interface CmisAclService { * Bindings: AtomPub * </p> */ - AccessControlList applyAcl(CallContext context, String repositoryId, String objectId, - AccessControlList aces, AclPropagation aclPropagation); + Acl applyAcl(CallContext context, String repositoryId, String objectId, + Acl aces, AclPropagation aclPropagation); } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java Thu Apr 15 15:34:36 2010 @@ -22,7 +22,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; @@ -52,7 +52,7 @@ public interface CmisObjectService { */ 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); /** @@ -64,7 +64,7 @@ public interface CmisObjectService { */ 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); /** @@ -75,8 +75,8 @@ public interface CmisObjectService { * </p> */ 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); /** * Create a new relationship. @@ -86,7 +86,7 @@ public interface CmisObjectService { * </p> */ String createRelationship(CallContext context, String repositoryId, PropertiesData properties, - List<String> policies, AccessControlList addAces, AccessControlList removeAces, + List<String> policies, Acl addAces, Acl removeAces, ExtensionsData extension); /** @@ -97,8 +97,8 @@ public interface CmisObjectService { * </p> */ 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); /** * Creates a new document, folder or policy. The property "cmis:objectTypeId" defines the type and @@ -184,7 +184,7 @@ public interface CmisObjectService { * </p> */ ObjectData updateProperties(CallContext context, String repositoryId, Holder<String> objectId, - Holder<String> changeToken, PropertiesData properties, AccessControlList acl, + Holder<String> changeToken, PropertiesData properties, Acl acl, ExtensionsData extension, ObjectInfoHolder objectInfos); /** Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java Thu Apr 15 15:34:36 2010 @@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se 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; @@ -62,8 +62,8 @@ public interface CmisVersioningService { 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); /** * Gets the latest version an object. Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java Thu Apr 15 15:34:36 2010 @@ -19,7 +19,7 @@ package org.apache.chemistry.opencmis.server.support; 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.server.spi.CallContext; import org.apache.chemistry.opencmis.server.spi.CmisAclService; @@ -56,8 +56,8 @@ public class AclServiceWrapper extends A * , 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) { checkRepositoryId(repositoryId); checkId("Object Id", objectId); aclPropagation = getDefault(aclPropagation); @@ -80,8 +80,8 @@ public class AclServiceWrapper extends A * 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) { checkRepositoryId(repositoryId); checkId("Object Id", objectId); @@ -104,7 +104,7 @@ public class AclServiceWrapper extends A * , 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) { checkRepositoryId(repositoryId); checkId("Object Id", objectId); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java Thu Apr 15 15:34:36 2010 @@ -22,7 +22,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; @@ -105,7 +105,7 @@ public class ObjectServiceWrapper extend */ 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) { checkRepositoryId(repositoryId); checkProperties(properties); @@ -134,7 +134,7 @@ public class ObjectServiceWrapper extend */ 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) { checkRepositoryId(repositoryId); checkId("Source Id", sourceId); @@ -160,8 +160,8 @@ public class ObjectServiceWrapper extend * 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) { checkRepositoryId(repositoryId); checkProperties(properties); checkId("Folder Id", folderId); @@ -186,8 +186,8 @@ public class ObjectServiceWrapper extend * 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) { checkRepositoryId(repositoryId); checkProperties(properties); @@ -211,8 +211,8 @@ public class ObjectServiceWrapper extend * 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) { checkRepositoryId(repositoryId); checkProperties(properties); @@ -518,7 +518,7 @@ public class ObjectServiceWrapper extend */ 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) { checkRepositoryId(repositoryId); checkHolderId("Object Id", objectId); checkProperties(properties); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java Thu Apr 15 15:34:36 2010 @@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se 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; @@ -92,8 +92,8 @@ public class VersioningServiceWrapper ex */ 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) { checkRepositoryId(repositoryId); checkHolderId("Object Id", objectId); major = getDefaultTrue(major); Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java Thu Apr 15 15:34:36 2010 @@ -72,7 +72,7 @@ public abstract class AbstractSimpleBind byte[] content = "This is a test file!".getBytes(); ContentStream contentStream = getBinding().getObjectFactory() - .createContentStream(BigInteger.valueOf(content.length), "text/plain", "test", + .createContentStream("test", BigInteger.valueOf(content.length), "text/plain", new ByteArrayInputStream(content)); // create document Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java?rev=934455&r1=934454&r2=934455&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java Thu Apr 15 15:34:36 2010 @@ -31,7 +31,7 @@ import java.util.UUID; 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.NavigationService; @@ -45,7 +45,7 @@ import org.apache.chemistry.opencmis.com import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; import org.apache.chemistry.opencmis.commons.enums.UnfileObjects; import org.apache.chemistry.opencmis.commons.enums.VersioningState; -import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamDataImpl; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -394,8 +394,8 @@ public class ObjectGenerator { ContentStream contentStream = null; VersioningState versioningState = VersioningState.NONE; List<String> policies = null; - AccessControlList addACEs = null; - AccessControlList removeACEs = null; + Acl addACEs = null; + Acl removeACEs = null; ExtensionsData extension = null; // log.info("create document in folder " + folderId); @@ -445,7 +445,7 @@ public class ObjectGenerator { } private ContentStream createContent() { - ContentStreamDataImpl content = new ContentStreamDataImpl(); + ContentStreamImpl content = new ContentStreamImpl(); content.setFileName("data.txt"); content.setMimeType("text/plain"); int len = fContentSizeInK * 1024; // size of document in K
