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 2009/08/05 19:15:41 UTC

svn commit: r801313 - in /incubator/chemistry/trunk/chemistry: chemistry-api/src/main/java/org/apache/chemistry/ chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/ chemistry-commons/src/main/java/org/apache/chemistry/impl/simpl...

Author: fguillaume
Date: Wed Aug  5 17:15:41 2009
New Revision: 801313

URL: http://svn.apache.org/viewvc?rev=801313&view=rev
Log:
CMIS-44: removed asUser arg from getAllowableActions, make it return QNames

Modified:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java?rev=801313&r1=801312&r2=801313&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/SPI.java Wed Aug  5 17:15:41 2009
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 /**
  * A SPI connection to a CMIS Repository.
  * <p>
@@ -277,16 +279,14 @@
     /**
      * Gets the allowable actions.
      * <p>
-     * Returns the list of allowable actions for an object based on the current
+     * Returns the list of allowable actions on an object based on the current
      * user's context, subject to any access constraints that are currently
      * imposed by the repository.
      *
      * @param object the object
-     * @param asUser the user for which the check should be made, or {@code
-     *            null} for the current user
      * @return the allowable actions
      */
-    Collection<String> getAllowableActions(ObjectId object, String asUser);
+    Collection<QName> getAllowableActions(ObjectId object);
 
     /**
      * Gets the properties of an object.

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java?rev=801313&r1=801312&r2=801313&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java Wed Aug  5 17:15:41 2009
@@ -30,6 +30,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 import org.apache.chemistry.ACE;
 import org.apache.chemistry.ACLPropagation;
 import org.apache.chemistry.BaseType;
@@ -413,7 +415,7 @@
         throw new UnsupportedOperationException();
     }
 
-    public Collection<String> getAllowableActions(ObjectId object, String asUser) {
+    public Collection<QName> getAllowableActions(ObjectId object) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java?rev=801313&r1=801312&r2=801313&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java Wed Aug  5 17:15:41 2009
@@ -28,6 +28,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.namespace.QName;
+
 import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CharStream;
 import org.antlr.runtime.CommonTokenStream;
@@ -448,7 +450,7 @@
         throw new UnsupportedOperationException();
     }
 
-    public Collection<String> getAllowableActions(ObjectId object, String asUser) {
+    public Collection<QName> getAllowableActions(ObjectId object) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }

Modified: incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java?rev=801313&r1=801312&r2=801313&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrConnection.java Wed Aug  5 17:15:41 2009
@@ -32,6 +32,7 @@
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
+import javax.xml.namespace.QName;
 
 import org.apache.chemistry.ACE;
 import org.apache.chemistry.ACLPropagation;
@@ -246,8 +247,7 @@
         throw new UnsupportedOperationException();
     }
 
-    public Collection<String> getAllowableActions(ObjectId objectId,
-            String asUser) {
+    public Collection<QName> getAllowableActions(ObjectId objectId) {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException();
     }