You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2010/04/16 10:33:54 UTC
svn commit: r934709 [1/2] - 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...
Author: fguillaume
Date: Fri Apr 16 08:33:53 2010
New Revision: 934709
URL: http://svn.apache.org/viewvc?rev=934709&view=rev
Log:
Refactor to get rid of duplicate DTOs (and their interfaces): AllowableActions
Added:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java (contents, props changed)
- copied, changed from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AllowableActions.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActions.java (contents, props changed)
- copied, changed from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActionsData.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java (contents, props changed)
- copied, changed from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java
Removed:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/AllowableActions.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AllowableActions.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AllowableActionsImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActionsData.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java
Modified:
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryResult.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/repository/PersistentObjectFactoryImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectData.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/ObjectService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java
incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/CmisObject.java Fri Apr 16 08:33:53 2010
@@ -26,6 +26,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.util.PagingList;
import org.apache.chemistry.opencmis.commons.bindings.Ace;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryResult.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryResult.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryResult.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/QueryResult.java Fri Apr 16 08:33:53 2010
@@ -20,6 +20,8 @@ package org.apache.chemistry.opencmis.cl
import java.util.List;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
+
/**
* Query result.
*/
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/repository/ObjectFactory.java Fri Apr 16 08:33:53 2010
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.chemistry.opencmis.client.api.AllowableActions;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.OperationContext;
import org.apache.chemistry.opencmis.client.api.Policy;
@@ -34,9 +33,8 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
import org.apache.chemistry.opencmis.commons.bindings.Ace;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+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;
@@ -50,12 +48,6 @@ import org.apache.chemistry.opencmis.com
*/
public interface ObjectFactory {
- // allowable actions
-
- AllowableActions createAllowableAction(Map<String, Boolean> actions);
-
- AllowableActions convertAllowableActions(AllowableActionsData allowableActions);
-
// ACL and ACE
Acl convertAces(List<Ace> aces);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/AtomPubParser.java Fri Apr 16 08:33:53 2010
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAcl;
-import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AllowableActions;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAllowableActions;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomBase;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
@@ -300,9 +300,9 @@ public class AtomPubParser implements Cm
/**
* Parses an Allowable Actions document.
*/
- private AllowableActions parseAllowableActions(XMLStreamReader parser) throws Exception {
+ private AtomAllowableActions parseAllowableActions(XMLStreamReader parser) throws Exception {
AtomElement elemenet = unmarshalElement(parser, CmisAllowableActionsType.class);
- return new AllowableActions((CmisAllowableActionsType) elemenet.getObject());
+ return new AtomAllowableActions((CmisAllowableActionsType) elemenet.getObject());
}
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/ObjectServiceImpl.java Fri Apr 16 08:33:53 2010
@@ -28,14 +28,14 @@ import java.util.Collections;
import java.util.List;
import org.apache.chemistry.opencmis.client.bindings.spi.Session;
-import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AllowableActions;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAllowableActions;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomElement;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomEntry;
import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomLink;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -62,9 +62,9 @@ import org.apache.chemistry.opencmis.com
/**
* Object Service AtomPub client.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
public class ObjectServiceImpl extends AbstractAtomPubService implements ObjectService {
@@ -77,7 +77,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#createDocument(java.lang.String,
* org.apache.opencmis.client.provider.PropertiesData, java.lang.String,
* org.apache.opencmis.client.provider.ContentStreamData,
@@ -134,7 +134,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.opencmis.client.provider.ObjectService#createDocumentFromSource(java.lang.String,
* java.lang.String, org.apache.opencmis.client.provider.PropertiesData, java.lang.String,
@@ -153,7 +153,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#createFolder(java.lang.String,
* org.apache.opencmis.client.provider.PropertiesData, java.lang.String, java.util.List,
* org.apache.opencmis.client.provider.AccessControlList,
@@ -199,7 +199,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#createPolicy(java.lang.String,
* org.apache.opencmis.client.provider.PropertiesData, java.lang.String, java.util.List,
* org.apache.opencmis.client.provider.AccessControlList,
@@ -245,7 +245,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#createRelationship(java.lang.String,
* org.apache.opencmis.client.provider.PropertiesData, java.util.List,
* org.apache.opencmis.client.provider.AccessControlList,
@@ -304,7 +304,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#updateProperties(java.lang.String,
* org.apache.opencmis.client.provider.Holder, org.apache.opencmis.client.provider.Holder,
* org.apache.opencmis.client.provider.PropertiesData,
@@ -399,7 +399,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#deleteObject(java.lang.String,
* java.lang.String, java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
*/
@@ -421,7 +421,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#deleteTree(java.lang.String,
* java.lang.String, java.lang.Boolean, org.apache.opencmis.commons.enums.UnfileObject,
* java.lang.Boolean, org.apache.opencmis.client.provider.ExtensionsData)
@@ -458,11 +458,11 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getAllowableActions(java.lang.String,
* java.lang.String, org.apache.opencmis.client.provider.ExtensionsData)
*/
- public AllowableActionsData getAllowableActions(String repositoryId, String objectId,
+ public AllowableActions getAllowableActions(String repositoryId, String objectId,
ExtensionsData extension) {
// find the link
String link = loadLink(repositoryId, objectId, Constants.REL_ALLOWABLEACTIONS,
@@ -477,14 +477,14 @@ public class ObjectServiceImpl extends A
// read and parse
HttpUtils.Response resp = read(url);
- AllowableActions allowableActions = parse(resp.getStream(), AllowableActions.class);
+ AtomAllowableActions allowableActions = parse(resp.getStream(), AtomAllowableActions.class);
return convert(allowableActions.getAllowableActions());
}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getContentStream(java.lang.String,
* java.lang.String, java.lang.String, java.math.BigInteger, java.math.BigInteger,
* org.apache.opencmis.client.provider.ExtensionsData)
@@ -522,7 +522,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getObject(java.lang.String,
* java.lang.String, java.lang.String, java.lang.Boolean,
* org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String, java.lang.Boolean,
@@ -539,7 +539,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getObjectByPath(java.lang.String,
* java.lang.String, java.lang.String, java.lang.Boolean,
* org.apache.opencmis.commons.enums.IncludeRelationships, java.lang.String, java.lang.Boolean,
@@ -556,7 +556,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getProperties(java.lang.String,
* java.lang.String, java.lang.String, org.apache.opencmis.client.provider.ExtensionsData)
*/
@@ -571,7 +571,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#getRenditions(java.lang.String,
* java.lang.String, java.lang.String, java.math.BigInteger, java.math.BigInteger,
* org.apache.opencmis.client.provider.ExtensionsData)
@@ -592,7 +592,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#moveObject(java.lang.String,
* org.apache.opencmis.client.provider.Holder, java.lang.String, java.lang.String,
* org.apache.opencmis.client.provider.ExtensionsData)
@@ -638,7 +638,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#setContentStream(java.lang.String,
* org.apache.opencmis.client.provider.Holder, java.lang.Boolean,
* org.apache.opencmis.client.provider.Holder,
@@ -703,7 +703,7 @@ public class ObjectServiceImpl extends A
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ObjectService#deleteContentStream(java.lang.String,
* org.apache.opencmis.client.provider.Holder, org.apache.opencmis.client.provider.Holder,
* org.apache.opencmis.client.provider.ExtensionsData)
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java (from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AllowableActions.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AllowableActions.java&r1=934452&r2=934709&rev=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AllowableActions.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java Fri Apr 16 08:33:53 2010
@@ -24,17 +24,17 @@ import org.apache.chemistry.opencmis.com
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
*
*/
-public class AllowableActions extends AtomBase {
+public class AtomAllowableActions extends AtomBase {
private static final long serialVersionUID = 1L;
private CmisAllowableActionsType fAllowableActions;
- public AllowableActions() {
+ public AtomAllowableActions() {
super();
}
- public AllowableActions(CmisAllowableActionsType allowableActions) {
+ public AtomAllowableActions(CmisAllowableActionsType allowableActions) {
this();
setAllowableActions(allowableActions);
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/atompub/objects/AtomAllowableActions.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/ObjectServiceImpl.java Fri Apr 16 08:33:53 2010
@@ -31,7 +31,7 @@ import java.util.List;
import org.apache.chemistry.opencmis.client.bindings.spi.Session;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -319,7 +319,7 @@ public class ObjectServiceImpl extends A
* @see org.apache.opencmis.client.provider.ObjectService#getAllowableActions(java.lang.String,
* java.lang.String, org.apache.opencmis.client.provider.ExtensionsData)
*/
- public AllowableActionsData getAllowableActions(String repositoryId, String objectId,
+ public AllowableActions getAllowableActions(String repositoryId, String objectId,
ExtensionsData extension) {
ObjectServicePort port = fPortProvider.getObjectServicePort();
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractCmisTestCase.java Fri Apr 16 08:33:53 2010
@@ -38,7 +38,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
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.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
@@ -54,6 +54,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
@@ -67,9 +68,9 @@ import org.apache.commons.logging.LogFac
/**
* Base test case for CMIS tests.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
public abstract class AbstractCmisTestCase extends TestCase {
@@ -614,7 +615,7 @@ public abstract class AbstractCmisTestCa
// check canGetProperties
assertAllowableAction(folderChild.getObject().getAllowableActions(),
- AllowableActionsData.ACTION_CAN_GET_PROPERTIES, true);
+ AllowableActionsEnum.CAN_GET_PROPERTIES, true);
// check name
PropertyData<?> nameProp = properties.getProperties().get(PropertyIds.CMIS_NAME);
@@ -672,12 +673,12 @@ public abstract class AbstractCmisTestCa
// check canGetProperties
assertAllowableAction(folderChild.getObject().getAllowableActions(),
- AllowableActionsData.ACTION_CAN_GET_PROPERTIES, true);
+ AllowableActionsEnum.CAN_GET_PROPERTIES, true);
// check canGetContentStream
if (contentStream != null) {
assertAllowableAction(folderChild.getObject().getAllowableActions(),
- AllowableActionsData.ACTION_CAN_GET_CONTENT_STREAM, true);
+ AllowableActionsEnum.CAN_GET_CONTENT_STREAM, true);
}
// check name
@@ -1090,7 +1091,7 @@ public abstract class AbstractCmisTestCa
assertPropertyValue(property, id, clazz, values);
}
- protected void assertEquals(AllowableActionsData expected, AllowableActionsData actual) {
+ protected void assertEquals(AllowableActions expected, AllowableActions actual) {
if ((expected == null) && (actual == null)) {
return;
}
@@ -1109,22 +1110,22 @@ public abstract class AbstractCmisTestCa
assertEquals("Allowable action size:", expected.getAllowableActions().size(), actual
.getAllowableActions().size());
- for (String action : expected.getAllowableActions().keySet()) {
- Boolean expectedBoolean = expected.getAllowableActions().get(action);
- Boolean actualBoolean = actual.getAllowableActions().get(action);
+ for (AllowableActionsEnum action : expected.getAllowableActions()) {
+ boolean expectedBoolean = expected.getAllowableActions().contains(action);
+ boolean actualBoolean = actual.getAllowableActions().contains(action);
assertEquals("AllowableAction " + action + ":", expectedBoolean, actualBoolean);
}
}
- protected void assertAllowableAction(AllowableActionsData allowableActions, String action,
- Boolean expected) {
+ protected void assertAllowableAction(AllowableActions allowableActions,
+ AllowableActionsEnum action, boolean expected) {
assertNotNull(allowableActions);
assertNotNull(allowableActions.getAllowableActions());
assertNotNull(action);
assertEquals("Allowable action \"" + action + "\":", expected, allowableActions
- .getAllowableActions().get(action));
+ .getAllowableActions().contains(action));
}
protected void assertEquals(Acl expected, Acl actual) {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/test/java/org/apache/chemistry/opencmis/client/bindings/framework/AbstractSimpleReadOnlyTests.java Fri Apr 16 08:33:53 2010
@@ -31,7 +31,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
@@ -41,15 +41,16 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
/**
* Simple read-only tests.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
public abstract class AbstractSimpleReadOnlyTests extends AbstractCmisTestCase {
@@ -190,7 +191,7 @@ public abstract class AbstractSimpleRead
String rootPath = getPath(rootFolderObject);
assertEquals("Root path is not \"/\"!", "/", rootPath);
assertAllowableAction(rootFolderObject.getAllowableActions(),
- AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS, false);
+ AllowableActionsEnum.CAN_GET_OBJECT_PARENTS, false);
ObjectData folderObject = getObject(testRootFolder);
String path = getPath(folderObject);
@@ -418,7 +419,7 @@ public abstract class AbstractSimpleRead
assertEquals(object.getProperties(), properties);
// check allowable actions
- AllowableActionsData allowableActions = getBinding().getObjectService().getAllowableActions(
+ AllowableActions allowableActions = getBinding().getObjectService().getAllowableActions(
getTestRepositoryId(), objectId, null);
assertEquals(object.getAllowableActions(), allowableActions);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/AbstractPersistentCmisObject.java Fri Apr 16 08:33:53 2010
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.chemistry.opencmis.client.api.AllowableActions;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.ObjectId;
import org.apache.chemistry.opencmis.client.api.OperationContext;
@@ -40,11 +39,13 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
import org.apache.chemistry.opencmis.client.api.repository.ObjectFactory;
import org.apache.chemistry.opencmis.client.api.util.PagingList;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAllowableActions;
import org.apache.chemistry.opencmis.client.runtime.util.AbstractPagingList;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
import org.apache.chemistry.opencmis.commons.bindings.Ace;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -109,7 +110,7 @@ public abstract class AbstractPersistent
// handle allowable actions
if (objectData.getAllowableActions() != null) {
- this.allowableActions = of.convertAllowableActions(objectData.getAllowableActions());
+ this.allowableActions = objectData.getAllowableActions();
}
// handle renditions
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.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/QueryResultImpl.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/QueryResultImpl.java Fri Apr 16 08:33:53 2010
@@ -24,7 +24,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.chemistry.opencmis.client.api.AllowableActions;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.QueryProperty;
import org.apache.chemistry.opencmis.client.api.QueryResult;
@@ -32,6 +31,8 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.Rendition;
import org.apache.chemistry.opencmis.client.api.Session;
import org.apache.chemistry.opencmis.client.api.repository.ObjectFactory;
+import org.apache.chemistry.opencmis.client.bindings.spi.atompub.objects.AtomAllowableActions;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
@@ -72,7 +73,7 @@ public class QueryResultImpl implements
// handle allowable actions
if (objectData.getAllowableActions() != null) {
- this.allowableActions = of.convertAllowableActions(objectData.getAllowableActions());
+ this.allowableActions = objectData.getAllowableActions();
}
// handle relationships
@@ -98,7 +99,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getProperties()
*/
public List<QueryProperty<?>> getProperties() {
@@ -107,7 +108,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getPropertyById(java.lang.String)
*/
@SuppressWarnings("unchecked")
@@ -117,7 +118,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getPropertyByQueryName(java.lang.String)
*/
@SuppressWarnings("unchecked")
@@ -127,7 +128,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getPropertyValueById(java.lang.String)
*/
public <T> T getPropertyValueById(String id) {
@@ -141,7 +142,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getPropertyValueByQueryName(java.lang.String)
*/
public <T> T getPropertyValueByQueryName(String queryName) {
@@ -155,7 +156,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getPropertyMultivalueById(java.lang.String)
*/
public <T> List<T> getPropertyMultivalueById(String id) {
@@ -169,7 +170,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see
* org.apache.opencmis.client.api.QueryResult#getPropertyMultivalueByQueryName(java.lang.String)
*/
@@ -184,7 +185,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getAllowableActions()
*/
public AllowableActions getAllowableActions() {
@@ -193,7 +194,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getRelationships()
*/
public List<Relationship> getRelationships() {
@@ -202,7 +203,7 @@ public class QueryResultImpl implements
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.api.QueryResult#getRenditions()
*/
public List<Rendition> getRenditions() {
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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.chemistry.opencmis.client.api.AllowableActions;
import org.apache.chemistry.opencmis.client.api.CmisObject;
import org.apache.chemistry.opencmis.client.api.OperationContext;
import org.apache.chemistry.opencmis.client.api.Policy;
@@ -40,7 +39,6 @@ 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.AllowableActionsImpl;
import org.apache.chemistry.opencmis.client.runtime.PersistentDocumentImpl;
import org.apache.chemistry.opencmis.client.runtime.PersistentFolderImpl;
import org.apache.chemistry.opencmis.client.runtime.PersistentPolicyImpl;
@@ -71,7 +69,6 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
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;
import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
@@ -118,33 +115,6 @@ public class PersistentObjectFactoryImpl
return session.getBinding().getObjectFactory();
}
- // allowable actions
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.opencmis.client.api.repository.ObjectFactory#createAllowableAction(java.util.Map)
- */
- public AllowableActions createAllowableAction(Map<String, Boolean> actions) {
- return new AllowableActionsImpl(actions);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.opencmis.client.api.repository.ObjectFactory#convertAllowableActions(org.apache.
- * opencmis.commons.provider.AllowableActionsData)
- */
- public AllowableActions convertAllowableActions(AllowableActionsData allowableActions) {
- if ((allowableActions == null) || (allowableActions.getAllowableActions() == null)) {
- throw new IllegalArgumentException("Allowable actions must be set!");
- }
-
- return createAllowableAction(allowableActions.getAllowableActions());
- }
-
// ACL and ACE
/*
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActions.java (from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActionsData.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/AllowableActions.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActions.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActionsData.java&r1=934452&r2=934709&rev=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActionsData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActions.java Fri Apr 16 08:33:53 2010
@@ -18,40 +18,13 @@
*/
package org.apache.chemistry.opencmis.commons.bindings;
-import java.util.Map;
+import java.util.Set;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
-public interface AllowableActionsData extends ExtensionsData {
- String ACTION_CAN_DELETE_OBJECT = "canDeleteObject";
- String ACTION_CAN_UPDATE_PROPERTIES = "canUpdateProperties";
- String ACTION_CAN_GET_PROPERTIES = "canGetProperties";
- String ACTION_CAN_GET_OBJECT_RELATIONSHIPS = "canGetObjectRelationships";
- String ACTION_CAN_GET_OBJECT_PARENTS = "canGetObjectParents";
- String ACTION_CAN_GET_FOLDER_PARENT = "canGetFolderParent";
- String ACTION_CAN_GET_FOLDER_TREE = "canGetFolderTree";
- String ACTION_CAN_GET_DESCENDANTS = "canGetDescendants";
- String ACTION_CAN_MOVE_OBJECT = "canMoveObject";
- String ACTION_CAN_DELETE_CONTENT_STREAM = "canDeleteContentStream";
- String ACTION_CAN_CHECK_OUT = "canCheckOut";
- String ACTION_CAN_CANCEL_CHECK_OUT = "canCancelCheckOut";
- String ACTION_CAN_CHECK_IN = "canCheckIn";
- String ACTION_CAN_SET_CONTENT_STREAM = "canSetContentStream";
- String ACTION_CAN_GET_ALL_VERSIONS = "canGetAllVersions";
- String ACTION_CAN_ADD_OBJECT_TO_FOLDER = "canAddObjectToFolder";
- String ACTION_CAN_REMOVE_OBJECT_FROM_FOLDER = "canRemoveObjectFromFolder";
- String ACTION_CAN_GET_CONTENT_STREAM = "canGetContentStream";
- String ACTION_CAN_APPLY_POLICY = "canApplyPolicy";
- String ACTION_CAN_GET_APPLIED_POLICIES = "canGetAppliedPolicies";
- String ACTION_CAN_REMOVE_POLICY = "canRemovePolicy";
- String ACTION_CAN_GET_CHILDREN = "canGetChildren";
- String ACTION_CAN_CREATE_DOCUMENT = "canCreateDocument";
- String ACTION_CAN_CREATE_FOLDER = "canCreateFolder";
- String ACTION_CAN_CREATE_RELATIONSHIP = "canCreateRelationship";
- String ACTION_CAN_DELETE_TREE = "canDeleteTree";
- String ACTION_CAN_GET_RENDITIONS = "canGetRenditions";
- String ACTION_CAN_GET_ACL = "canGetACL";
- String ACTION_CAN_APPLY_ACL = "canApplyACL";
+public interface AllowableActions extends ExtensionsData {
+
+ Set<AllowableActionsEnum> getAllowableActions();
- Map<String, Boolean> getAllowableActions();
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-api/src/main/java/org/apache/chemistry/opencmis/commons/bindings/AllowableActions.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/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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -57,7 +57,7 @@ public interface ObjectData extends Exte
*
* @return the allowable actions or <code>null</code> if the allowable actions are unknown
*/
- AllowableActionsData getAllowableActions();
+ AllowableActions getAllowableActions();
/**
* Returns the relationships from and to this object.
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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -55,7 +55,7 @@ public interface ObjectService {
List<String> policies, Acl addAces, Acl removeAces,
ExtensionsData extension);
- AllowableActionsData getAllowableActions(String repositoryId, String objectId,
+ AllowableActions getAllowableActions(String repositoryId, String objectId,
ExtensionsData extension);
ObjectData getObject(String repositoryId, String objectId, String filter,
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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -25,11 +25,13 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -58,7 +60,7 @@ import org.apache.chemistry.opencmis.com
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.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -85,6 +87,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
@@ -107,7 +110,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlListImpl;
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.AllowableActionsImpl;
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.ContentStreamImpl;
@@ -1745,68 +1748,46 @@ public final class Converter {
/**
* Converts an AllowableActions object.
*/
- public static AllowableActionsData convert(CmisAllowableActionsType allowableActions) {
+ public static AllowableActions convert(CmisAllowableActionsType allowableActions) {
if (allowableActions == null) {
return null;
}
- AllowableActionsDataImpl result = new AllowableActionsDataImpl();
+ AllowableActionsImpl result = new AllowableActionsImpl();
- Map<String, Boolean> actionsMap = new HashMap<String, Boolean>();
- actionsMap.put(AllowableActionsData.ACTION_CAN_ADD_OBJECT_TO_FOLDER, allowableActions
- .isCanAddObjectToFolder());
- actionsMap.put(AllowableActionsData.ACTION_CAN_APPLY_ACL, allowableActions.isCanApplyACL());
- actionsMap.put(AllowableActionsData.ACTION_CAN_APPLY_POLICY, allowableActions
- .isCanApplyPolicy());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CANCEL_CHECK_OUT, allowableActions
- .isCanCancelCheckOut());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CHECK_IN, allowableActions.isCanCheckIn());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CHECK_OUT, allowableActions.isCanCheckOut());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CREATE_DOCUMENT, allowableActions
- .isCanCreateDocument());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CREATE_FOLDER, allowableActions
- .isCanCreateFolder());
- actionsMap.put(AllowableActionsData.ACTION_CAN_CREATE_RELATIONSHIP, allowableActions
- .isCanCreateRelationship());
- actionsMap.put(AllowableActionsData.ACTION_CAN_DELETE_CONTENT_STREAM, allowableActions
- .isCanDeleteContentStream());
- actionsMap.put(AllowableActionsData.ACTION_CAN_DELETE_OBJECT, allowableActions
- .isCanDeleteObject());
- actionsMap.put(AllowableActionsData.ACTION_CAN_DELETE_TREE, allowableActions.isCanDeleteTree());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_ACL, allowableActions.isCanGetACL());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_ALL_VERSIONS, allowableActions
- .isCanGetAllVersions());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_APPLIED_POLICIES, allowableActions
- .isCanGetAppliedPolicies());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_CHILDREN, allowableActions
- .isCanGetChildren());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_CONTENT_STREAM, allowableActions
- .isCanGetContentStream());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_DESCENDANTS, allowableActions
- .isCanGetDescendants());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_PARENT, allowableActions
- .isCanGetFolderParent());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_TREE, allowableActions
- .isCanGetFolderTree());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS, allowableActions
- .isCanGetObjectParents());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_RELATIONSHIPS, allowableActions
- .isCanGetObjectRelationships());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_PROPERTIES, allowableActions
- .isCanGetProperties());
- actionsMap.put(AllowableActionsData.ACTION_CAN_GET_RENDITIONS, allowableActions
- .isCanGetRenditions());
- actionsMap.put(AllowableActionsData.ACTION_CAN_MOVE_OBJECT, allowableActions.isCanMoveObject());
- actionsMap.put(AllowableActionsData.ACTION_CAN_REMOVE_OBJECT_FROM_FOLDER, allowableActions
- .isCanRemoveObjectFromFolder());
- actionsMap.put(AllowableActionsData.ACTION_CAN_REMOVE_POLICY, allowableActions
- .isCanRemovePolicy());
- actionsMap.put(AllowableActionsData.ACTION_CAN_SET_CONTENT_STREAM, allowableActions
- .isCanSetContentStream());
- actionsMap.put(AllowableActionsData.ACTION_CAN_UPDATE_PROPERTIES, allowableActions
- .isCanUpdateProperties());
+ Set<AllowableActionsEnum> set = EnumSet.noneOf(AllowableActionsEnum.class);
- result.setAllowableActions(actionsMap);
+ if(Boolean.TRUE.equals(allowableActions.isCanAddObjectToFolder())) { set.add(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanApplyACL())) { set.add(AllowableActionsEnum.CAN_APPLY_ACL); }
+ if(Boolean.TRUE.equals(allowableActions.isCanApplyPolicy())) { set.add(AllowableActionsEnum.CAN_APPLY_POLICY); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCancelCheckOut())) { set.add(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCheckIn())) { set.add(AllowableActionsEnum.CAN_CHECK_IN); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCheckOut())) { set.add(AllowableActionsEnum.CAN_CHECK_OUT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateDocument())) { set.add(AllowableActionsEnum.CAN_CREATE_DOCUMENT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateFolder())) { set.add(AllowableActionsEnum.CAN_CREATE_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanCreateRelationship())) { set.add(AllowableActionsEnum.CAN_CREATE_RELATIONSHIP); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteContentStream())) { set.add(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteObject())) { set.add(AllowableActionsEnum.CAN_DELETE_OBJECT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanDeleteTree())) { set.add(AllowableActionsEnum.CAN_DELETE_TREE); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetACL())) { set.add(AllowableActionsEnum.CAN_GET_ACL); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetAllVersions())) { set.add(AllowableActionsEnum.CAN_GET_ALL_VERSIONS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetAppliedPolicies())) { set.add(AllowableActionsEnum.CAN_GET_APPLIED_POLICIES); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetChildren())) { set.add(AllowableActionsEnum.CAN_GET_CHILDREN); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetContentStream())) { set.add(AllowableActionsEnum.CAN_GET_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetDescendants())) { set.add(AllowableActionsEnum.CAN_GET_DESCENDANTS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetFolderParent())) { set.add(AllowableActionsEnum.CAN_GET_FOLDER_PARENT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetFolderTree())) { set.add(AllowableActionsEnum.CAN_GET_FOLDER_TREE); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetObjectParents())) { set.add(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetObjectRelationships())) { set.add(AllowableActionsEnum.CAN_GET_OBJECT_RELATIONSHIPS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetProperties())) { set.add(AllowableActionsEnum.CAN_GET_PROPERTIES); }
+ if(Boolean.TRUE.equals(allowableActions.isCanGetRenditions())) { set.add(AllowableActionsEnum.CAN_GET_RENDITIONS); }
+ if(Boolean.TRUE.equals(allowableActions.isCanMoveObject())) { set.add(AllowableActionsEnum.CAN_MOVE_OBJECT); }
+ if(Boolean.TRUE.equals(allowableActions.isCanRemoveObjectFromFolder())) { set.add(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER); }
+ if(Boolean.TRUE.equals(allowableActions.isCanRemovePolicy())) { set.add(AllowableActionsEnum.CAN_REMOVE_POLICY); }
+ if(Boolean.TRUE.equals(allowableActions.isCanSetContentStream())) { set.add(AllowableActionsEnum.CAN_SET_CONTENT_STREAM); }
+ if(Boolean.TRUE.equals(allowableActions.isCanUpdateProperties())) { set.add(AllowableActionsEnum.CAN_UPDATE_PROPERTIES); }
+
+ result.setAllowableActions(set);
// handle extensions
convertExtension(allowableActions, result);
@@ -1817,7 +1798,7 @@ public final class Converter {
/**
* Converts an AllowableActions object.
*/
- public static CmisAllowableActionsType convert(AllowableActionsData allowableActions) {
+ public static CmisAllowableActionsType convert(AllowableActions allowableActions) {
if (allowableActions == null) {
return null;
}
@@ -1825,48 +1806,38 @@ public final class Converter {
CmisAllowableActionsType result = new CmisAllowableActionsType();
if (allowableActions.getAllowableActions() != null) {
- Map<String, Boolean> actionsMap = allowableActions.getAllowableActions();
+ Set<AllowableActionsEnum> set = allowableActions.getAllowableActions();
+
+ result.setCanAddObjectToFolder(set.contains(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER));
+ result.setCanApplyACL(set.contains(AllowableActionsEnum.CAN_APPLY_ACL));
+ result.setCanApplyPolicy(set.contains(AllowableActionsEnum.CAN_APPLY_POLICY));
+ result.setCanCancelCheckOut(set.contains(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT));
+ result.setCanCheckIn(set.contains(AllowableActionsEnum.CAN_CHECK_IN));
+ result.setCanCheckOut(set.contains(AllowableActionsEnum.CAN_CHECK_OUT));
+ result.setCanCreateDocument(set.contains(AllowableActionsEnum.CAN_CREATE_DOCUMENT));
+ result.setCanCreateFolder(set.contains(AllowableActionsEnum.CAN_CREATE_FOLDER));
+ result.setCanCreateRelationship(set.contains(AllowableActionsEnum.CAN_CREATE_RELATIONSHIP));
+ result.setCanDeleteContentStream(set.contains(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM));
+ result.setCanDeleteObject(set.contains(AllowableActionsEnum.CAN_DELETE_OBJECT));
+ result.setCanDeleteTree(set.contains(AllowableActionsEnum.CAN_DELETE_TREE));
+ result.setCanGetACL(set.contains(AllowableActionsEnum.CAN_GET_ACL));
+ result.setCanGetAllVersions(set.contains(AllowableActionsEnum.CAN_GET_ALL_VERSIONS));
+ result.setCanGetAppliedPolicies(set.contains(AllowableActionsEnum.CAN_GET_APPLIED_POLICIES));
+ result.setCanGetChildren(set.contains(AllowableActionsEnum.CAN_GET_CHILDREN));
+ result.setCanGetContentStream(set.contains(AllowableActionsEnum.CAN_GET_CONTENT_STREAM));
+ result.setCanGetDescendants(set.contains(AllowableActionsEnum.CAN_GET_DESCENDANTS));
+ result.setCanGetFolderParent(set.contains(AllowableActionsEnum.CAN_GET_FOLDER_PARENT));
+ result.setCanGetFolderTree(set.contains(AllowableActionsEnum.CAN_GET_FOLDER_TREE));
+ result.setCanGetObjectParents(set.contains(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS));
+ result.setCanGetObjectRelationships(set.contains(AllowableActionsEnum.CAN_GET_OBJECT_RELATIONSHIPS));
+ result.setCanGetProperties(set.contains(AllowableActionsEnum.CAN_GET_PROPERTIES));
+ result.setCanGetRenditions(set.contains(AllowableActionsEnum.CAN_GET_RENDITIONS));
+ result.setCanMoveObject(set.contains(AllowableActionsEnum.CAN_MOVE_OBJECT));
+ result.setCanRemoveObjectFromFolder(set.contains(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER));
+ result.setCanRemovePolicy(set.contains(AllowableActionsEnum.CAN_REMOVE_POLICY));
+ result.setCanSetContentStream(set.contains(AllowableActionsEnum.CAN_SET_CONTENT_STREAM));
+ result.setCanUpdateProperties(set.contains(AllowableActionsEnum.CAN_UPDATE_PROPERTIES));
- result.setCanAddObjectToFolder(actionsMap
- .get(AllowableActionsData.ACTION_CAN_ADD_OBJECT_TO_FOLDER));
- result.setCanApplyACL(actionsMap.get(AllowableActionsData.ACTION_CAN_APPLY_ACL));
- result.setCanApplyPolicy(actionsMap.get(AllowableActionsData.ACTION_CAN_APPLY_POLICY));
- result.setCanCancelCheckOut(actionsMap.get(AllowableActionsData.ACTION_CAN_CANCEL_CHECK_OUT));
- result.setCanCheckIn(actionsMap.get(AllowableActionsData.ACTION_CAN_CHECK_IN));
- result.setCanCheckOut(actionsMap.get(AllowableActionsData.ACTION_CAN_CHECK_OUT));
- result.setCanCreateDocument(actionsMap.get(AllowableActionsData.ACTION_CAN_CREATE_DOCUMENT));
- result.setCanCreateFolder(actionsMap.get(AllowableActionsData.ACTION_CAN_CREATE_FOLDER));
- result.setCanCreateRelationship(actionsMap
- .get(AllowableActionsData.ACTION_CAN_CREATE_RELATIONSHIP));
- result.setCanDeleteContentStream(actionsMap
- .get(AllowableActionsData.ACTION_CAN_DELETE_CONTENT_STREAM));
- result.setCanDeleteObject(actionsMap.get(AllowableActionsData.ACTION_CAN_DELETE_OBJECT));
- result.setCanDeleteTree(actionsMap.get(AllowableActionsData.ACTION_CAN_DELETE_TREE));
- result.setCanGetACL(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_ACL));
- result.setCanGetAllVersions(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_ALL_VERSIONS));
- result.setCanGetAppliedPolicies(actionsMap
- .get(AllowableActionsData.ACTION_CAN_GET_APPLIED_POLICIES));
- result.setCanGetChildren(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_CHILDREN));
- result.setCanGetContentStream(actionsMap
- .get(AllowableActionsData.ACTION_CAN_GET_CONTENT_STREAM));
- result.setCanGetDescendants(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_DESCENDANTS));
- result.setCanGetFolderParent(actionsMap
- .get(AllowableActionsData.ACTION_CAN_GET_FOLDER_PARENT));
- result.setCanGetFolderTree(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_FOLDER_TREE));
- result.setCanGetObjectParents(actionsMap
- .get(AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS));
- result.setCanGetObjectRelationships(actionsMap
- .get(AllowableActionsData.ACTION_CAN_GET_OBJECT_RELATIONSHIPS));
- result.setCanGetProperties(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_PROPERTIES));
- result.setCanGetRenditions(actionsMap.get(AllowableActionsData.ACTION_CAN_GET_RENDITIONS));
- result.setCanMoveObject(actionsMap.get(AllowableActionsData.ACTION_CAN_MOVE_OBJECT));
- result.setCanRemoveObjectFromFolder(actionsMap
- .get(AllowableActionsData.ACTION_CAN_REMOVE_OBJECT_FROM_FOLDER));
- result.setCanRemovePolicy(actionsMap.get(AllowableActionsData.ACTION_CAN_REMOVE_POLICY));
- result.setCanSetContentStream(actionsMap
- .get(AllowableActionsData.ACTION_CAN_SET_CONTENT_STREAM));
- result.setCanUpdateProperties(actionsMap
- .get(AllowableActionsData.ACTION_CAN_UPDATE_PROPERTIES));
}
// handle extensions
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java (from r934452, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.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/AllowableActionsImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java&r1=934452&r2=934709&rev=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.java Fri Apr 16 08:33:53 2010
@@ -18,38 +18,40 @@
*/
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
-import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
-public class AllowableActionsDataImpl extends AbstractExtensionData implements AllowableActionsData {
+public class AllowableActionsImpl extends AbstractExtensionData implements AllowableActions {
- private Map<String, Boolean> fAllowableActions;
+ private Set<AllowableActionsEnum> allowableActions = new HashSet<AllowableActionsEnum>();
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.AllowableActionsData#getAllowableActions()
*/
- public Map<String, Boolean> getAllowableActions() {
- return fAllowableActions;
+ public Set<AllowableActionsEnum> getAllowableActions() {
+ return allowableActions;
}
- public void setAllowableActions(Map<String, Boolean> allowableActions) {
- fAllowableActions = allowableActions;
+ public void setAllowableActions(Set<AllowableActionsEnum> allowableActions) {
+ this.allowableActions = allowableActions;
}
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Allowable Actions [allowable actions=" + fAllowableActions + "]" + super.toString();
+ return "Allowable Actions [allowable actions=" + allowableActions + "]" + super.toString();
}
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsImpl.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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ChangeEventInfoData;
import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
import org.apache.chemistry.opencmis.commons.bindings.PolicyIdListData;
@@ -42,7 +42,7 @@ public class ObjectDataImpl extends Abst
private List<ObjectData> fRelationships;
private List<RenditionData> fRenditions;
private PolicyIdListData fPolicyIds;
- private AllowableActionsData fAllowableActions;
+ private AllowableActions fAllowableActions;
private Acl fAcl;
private Boolean fIsExactAcl;
@@ -148,11 +148,11 @@ public class ObjectDataImpl extends Abst
*
* @see org.apache.opencmis.client.provider.ObjectData#getAllowableActions()
*/
- public AllowableActionsData getAllowableActions() {
+ public AllowableActions getAllowableActions() {
return fAllowableActions;
}
- public void setAllowableActions(AllowableActionsData allowableActions) {
+ public void setAllowableActions(AllowableActions allowableActions) {
fAllowableActions = allowableActions;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.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/AllowableActionsDocument.java?rev=934709&r1=934708&r2=934709&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.java Fri Apr 16 08:33:53 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.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAllowableActionsType;
@@ -46,7 +46,7 @@ public class AllowableActionsDocument {
/**
* Writes an object.
*/
- public void writeAllowableActions(AllowableActionsData allowableActions, OutputStream out)
+ public void writeAllowableActions(AllowableActions allowableActions, OutputStream out)
throws XMLStreamException, JAXBException {
CmisAllowableActionsType allowableActionsJaxb = convert(allowableActions);
if (allowableActionsJaxb == null) {
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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -405,7 +405,7 @@ public final class ObjectService {
String objectId = getStringParameter(request, Constants.PARAM_ID);
// execute
- AllowableActionsData allowableActions = service.getAllowableActions(context, repositoryId,
+ AllowableActions allowableActions = service.getAllowableActions(context, repositoryId,
objectId, null);
if (allowableActions == null) {
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=934709&r1=934708&r2=934709&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 Fri Apr 16 08:33:53 2010
@@ -51,7 +51,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
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.AllowableActions;
import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
import org.apache.chemistry.opencmis.commons.bindings.Holder;
@@ -69,6 +69,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
+import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
@@ -96,7 +97,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AccessControlListImpl;
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.AllowableActionsImpl;
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;
@@ -899,7 +900,7 @@ public class FileShareRepository {
/**
* CMIS getAllowableActions.
*/
- public AllowableActionsData getAllowableActions(CallContext context, String objectId) {
+ public AllowableActions getAllowableActions(CallContext context, String objectId) {
debug("getAllowableActions");
boolean userReadOnly = checkUser(context, false);
@@ -1822,7 +1823,7 @@ public class FileShareRepository {
/**
* Compiles the allowable actions for a file or folder.
*/
- private AllowableActionsData compileAllowableActions(File file, boolean userReadOnly) {
+ private AllowableActions compileAllowableActions(File file, boolean userReadOnly) {
if (file == null) {
throw new IllegalArgumentException("File must not be null!");
}
@@ -1836,43 +1837,44 @@ public class FileShareRepository {
boolean isFolder = file.isDirectory();
boolean isRoot = fRoot.equals(file);
- Map<String, Boolean> aam = new HashMap<String, Boolean>();
+ Set<AllowableActionsEnum> aam = new HashSet<AllowableActionsEnum>();
- aam.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS, !isRoot);
- aam.put(AllowableActionsData.ACTION_CAN_CREATE_RELATIONSHIP, false);
- aam.put(AllowableActionsData.ACTION_CAN_GET_PROPERTIES, true);
- aam.put(AllowableActionsData.ACTION_CAN_GET_RENDITIONS, false);
- aam.put(AllowableActionsData.ACTION_CAN_UPDATE_PROPERTIES, !userReadOnly && !isReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_MOVE_OBJECT, !userReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_DELETE_OBJECT, !userReadOnly && !isReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_RELATIONSHIPS, false);
- aam.put(AllowableActionsData.ACTION_CAN_APPLY_POLICY, false);
- aam.put(AllowableActionsData.ACTION_CAN_REMOVE_POLICY, false);
- aam.put(AllowableActionsData.ACTION_CAN_GET_ACL, true);
- aam.put(AllowableActionsData.ACTION_CAN_APPLY_ACL, false);
+ // TODO XXX use enum
+// aam.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS, !isRoot);
+// aam.put(AllowableActionsData.ACTION_CAN_CREATE_RELATIONSHIP, false);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_PROPERTIES, true);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_RENDITIONS, false);
+// aam.put(AllowableActionsData.ACTION_CAN_UPDATE_PROPERTIES, !userReadOnly && !isReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_MOVE_OBJECT, !userReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_DELETE_OBJECT, !userReadOnly && !isReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_RELATIONSHIPS, false);
+// aam.put(AllowableActionsData.ACTION_CAN_APPLY_POLICY, false);
+// aam.put(AllowableActionsData.ACTION_CAN_REMOVE_POLICY, false);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_ACL, true);
+// aam.put(AllowableActionsData.ACTION_CAN_APPLY_ACL, false);
if (isFolder) {
- aam.put(AllowableActionsData.ACTION_CAN_GET_DESCENDANTS, true);
- aam.put(AllowableActionsData.ACTION_CAN_GET_CHILDREN, true);
- aam.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_PARENT, !isRoot);
- aam.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_TREE, true);
- aam.put(AllowableActionsData.ACTION_CAN_CREATE_DOCUMENT, !userReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_CREATE_FOLDER, !userReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_DELETE_TREE, !userReadOnly && !isReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_DESCENDANTS, true);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_CHILDREN, true);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_PARENT, !isRoot);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_FOLDER_TREE, true);
+// aam.put(AllowableActionsData.ACTION_CAN_CREATE_DOCUMENT, !userReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_CREATE_FOLDER, !userReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_DELETE_TREE, !userReadOnly && !isReadOnly);
}
else {
- aam.put(AllowableActionsData.ACTION_CAN_GET_CONTENT_STREAM, true);
- aam.put(AllowableActionsData.ACTION_CAN_SET_CONTENT_STREAM, !userReadOnly && !isReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_DELETE_CONTENT_STREAM, !userReadOnly && !isReadOnly);
- aam.put(AllowableActionsData.ACTION_CAN_ADD_OBJECT_TO_FOLDER, false);
- aam.put(AllowableActionsData.ACTION_CAN_REMOVE_OBJECT_FROM_FOLDER, false);
- aam.put(AllowableActionsData.ACTION_CAN_CHECK_OUT, false);
- aam.put(AllowableActionsData.ACTION_CAN_CANCEL_CHECK_OUT, false);
- aam.put(AllowableActionsData.ACTION_CAN_CHECK_IN, false);
- aam.put(AllowableActionsData.ACTION_CAN_GET_ALL_VERSIONS, true);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_CONTENT_STREAM, true);
+// aam.put(AllowableActionsData.ACTION_CAN_SET_CONTENT_STREAM, !userReadOnly && !isReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_DELETE_CONTENT_STREAM, !userReadOnly && !isReadOnly);
+// aam.put(AllowableActionsData.ACTION_CAN_ADD_OBJECT_TO_FOLDER, false);
+// aam.put(AllowableActionsData.ACTION_CAN_REMOVE_OBJECT_FROM_FOLDER, false);
+// aam.put(AllowableActionsData.ACTION_CAN_CHECK_OUT, false);
+// aam.put(AllowableActionsData.ACTION_CAN_CANCEL_CHECK_OUT, false);
+// aam.put(AllowableActionsData.ACTION_CAN_CHECK_IN, false);
+// aam.put(AllowableActionsData.ACTION_CAN_GET_ALL_VERSIONS, true);
}
- AllowableActionsDataImpl result = new AllowableActionsDataImpl();
+ AllowableActionsImpl result = new AllowableActionsImpl();
result.setAllowableActions(aam);
return result;