You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/03/25 18:15:15 UTC
svn commit: r758349 - in
/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security:
AccessControlManager.java Privilege.java
Author: angela
Date: Wed Mar 25 17:15:07 2009
New Revision: 758349
URL: http://svn.apache.org/viewvc?rev=758349&view=rev
Log:
JCR-1588: Access Control
Modified:
jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/AccessControlManager.java
jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/Privilege.java
Modified: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/AccessControlManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/AccessControlManager.java?rev=758349&r1=758348&r2=758349&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/AccessControlManager.java (original)
+++ jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/AccessControlManager.java Wed Mar 25 17:15:07 2009
@@ -225,11 +225,21 @@
/**
* Binds the <code>policy</code> to the node at <code>absPath</code>.
- * <p/>
- * Only policies obtained through <code>getApplicablePolicies(absPath)</code>
- * can be set. The access control policy does not take effect until a
- * <code>save</code> is performed.
- * <p/>
+ * <p>
+ * The behavior of the call <code>acm.setPolicy(absPath, policy)</code>
+ * differs depending on how the <code>policy</code> object was originally acquired.
+ * <p>
+ * If <code>policy</code> was acquired through
+ * {@link #getApplicablePolicies acm.getApplicablePolicies(absPath)}
+ * then that <code>policy</code> object is <i>added</i> to the node at <code>absPath</code>.
+ * <p>
+ * On the other hand, if <code>policy</code> was acquired through
+ * {@link #getPolicies acm.getPolicies(absPath)}
+ * then that <code>policy</code> object (usually after being altered) replaces its former version
+ * on the node at <code>absPath</code>.
+ * <p>
+ * The access control policy does not take effect until a <code>save</code> is performed.
+ * <p>
* Any implementation-specific (non-JCR) access control settings may be
* changed in response to a successful call to <code>setPolicy</code>.
* <p/>
Modified: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/Privilege.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/Privilege.java?rev=758349&r1=758348&r2=758349&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/Privilege.java (original)
+++ jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/jsr283/security/Privilege.java Wed Mar 25 17:15:07 2009
@@ -139,6 +139,11 @@
* <li><code>jcr:write</code></li>
* <li><code>jcr:readAccessControl</code></li>
* <li><code>jcr:modifyAccessControl</code></li>
+ * <li><code>jcr:lockManagement</code></li>
+ * <li><code>jcr:versionManagement</code></li>
+ * <li><code>jcr:nodeTypeManagement</code></li>
+ * <li><code>jcr:retentionManagement</code></li>
+ * <li><code>jcr:lifecycleManagement</code></li>
* </ul>
* It should, in addition, include all implementation-defined privileges.
*/