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 2014/08/06 14:29:15 UTC
svn commit: r1616210 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission:
CompositePermissionProvider.java PermissionProvider.java
Author: angela
Date: Wed Aug 6 12:29:15 2014
New Revision: 1616210
URL: http://svn.apache.org/r1616210
Log:
OAK-1268 : Add support for composite authorization setup (wip)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/CompositePermissionProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/CompositePermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/CompositePermissionProvider.java?rev=1616210&r1=1616209&r2=1616210&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/CompositePermissionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/CompositePermissionProvider.java Wed Aug 6 12:29:15 2014
@@ -71,7 +71,6 @@ public class CompositePermissionProvider
}
}
- @Nonnull
@Override
public Set<String> getPrivileges(@Nullable Tree tree) {
return pbp.getPrivilegeNames(getPrivilegeBits(tree));
@@ -252,7 +251,7 @@ public class CompositePermissionProvider
//--------------------------------------------------------------------------
- private class CompositeTreePermission implements TreePermission {
+ private final class CompositeTreePermission implements TreePermission {
private final ImmutableTree tree;
private final CompositeTreePermission parentPermission;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java?rev=1616210&r1=1616209&r2=1616210&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java Wed Aug 6 12:29:15 2014
@@ -76,6 +76,7 @@ public interface PermissionProvider {
* @return The {@link org.apache.jackrabbit.oak.spi.security.authorization.permission.RepositoryPermission}
* for the set of {@code Principal}s this provider instance has been created for.
*/
+ @Nonnull
RepositoryPermission getRepositoryPermission();
/**
@@ -87,6 +88,7 @@ public interface PermissionProvider {
* obtained before for the parent tree.
* @return The {@code TreePermission} object for the specified {@code tree}.
*/
+ @Nonnull
TreePermission getTreePermission(@Nonnull Tree tree, @Nonnull TreePermission parentPermission);
/**