You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/08/08 11:45:55 UTC

svn commit: r1511655 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization: AuthorizationConfigurationImpl.java AuthorizationInitializer.java accesscontrol/AccessControlInitializer.java

Author: angela
Date: Thu Aug  8 09:45:54 2013
New Revision: 1511655

URL: http://svn.apache.org/r1511655
Log:
OAK-51 : Access Control Management

improve separation between ac-mgt and permission evaluation

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java   (contents, props changed)
      - copied, changed from r1511631, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlInitializer.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlInitializer.java
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java?rev=1511655&r1=1511654&r2=1511655&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationConfigurationImpl.java Thu Aug  8 09:45:54 2013
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.oak.api.Roo
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.version.VersionablePathHook;
 import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlImporter;
-import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlInitializer;
 import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlManagerImpl;
 import org.apache.jackrabbit.oak.security.authorization.accesscontrol.AccessControlValidatorProvider;
 import org.apache.jackrabbit.oak.security.authorization.permission.PermissionHook;
@@ -71,7 +70,7 @@ public class AuthorizationConfigurationI
     @Nonnull
     @Override
     public WorkspaceInitializer getWorkspaceInitializer() {
-        return new AccessControlInitializer();
+        return new AuthorizationInitializer();
     }
 
     @Nonnull

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java (from r1511631, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlInitializer.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlInitializer.java&r1=1511631&r2=1511655&rev=1511655&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java Thu Aug  8 09:45:54 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
+package org.apache.jackrabbit.oak.security.authorization;
 
 import javax.annotation.Nonnull;
 
@@ -34,11 +34,16 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
 
 /**
- * Implementation of the {@code WorkspaceInitializer} interface that creates
- * a property index definitions for {@link #REP_PRINCIPAL_NAME rep:principalName}
- * properties defined with ACE nodes.
+ * Implementation of the {@code WorkspaceInitializer} interface that
+ * <ul>
+ *     <li>creates a property index definitions for
+ *     {@link #REP_PRINCIPAL_NAME rep:principalName} properties defined with ACE
+ *     nodes</li>
+ *     <li>asserts that the permission store is setup and has dedicated entry for
+ *     this workspace.</li>
+ * </ul>.
  */
-public class AccessControlInitializer implements WorkspaceInitializer, AccessControlConstants, PermissionConstants {
+class AuthorizationInitializer implements WorkspaceInitializer, AccessControlConstants, PermissionConstants {
 
     @Nonnull
     @Override

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationInitializer.java
------------------------------------------------------------------------------
    svn:eol-style = native