svn commit: r1512318 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/security/authorization/permission/ main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/ test/java/org/apache/jackrabbit/oak/security...

[angela]

Author: angela
Date: Fri Aug  9 14:20:34 2013
New Revision: 1512318

URL: http://svn.apache.org/r1512318
Log:
OAK-527: permissions (minor improvement)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionConstants.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImplTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java?rev=1512318&r1=1512317&r2=1512318&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImpl.java
 Fri Aug  9 14:20:34 2013
@@ -184,7 +184,7 @@ public class PermissionProviderImpl impl
     
//--------------------------------------------------------------------------
 
     private boolean isAdmin(Set<Principal> principals) {
-        Set<String> adminNames = 
ImmutableSet.copyOf(acConfig.getParameters().getConfigValue(PARAM_ADMINISTRATOR_PRINCIPALS,
 new String[0]));
+        Set<String> adminNames = 
ImmutableSet.copyOf(acConfig.getParameters().getConfigValue(PARAM_ADMINISTRATIVE_PRINCIPALS,
 new String[0]));
         for (Principal principal : principals) {
             if (principal instanceof AdminPrincipal || 
adminNames.contains(principal.getName())) {
                 return true;

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionConstants.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionConstants.java?rev=1512318&r1=1512317&r2=1512318&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionConstants.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionConstants.java
 Fri Aug  9 14:20:34 2013
@@ -92,7 +92,7 @@ public interface PermissionConstants {
      *
      * @since OAK 1.0
      */
-    String PARAM_ADMINISTRATOR_PRINCIPALS = "administratorPrincipals";
+    String PARAM_ADMINISTRATIVE_PRINCIPALS = "administrativePrincipals";
 
     /**
      * Configuration parameter to enable full read access to regular nodes and

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImplTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImplTest.java?rev=1512318&r1=1512317&r2=1512318&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImplTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionProviderImplTest.java
 Fri Aug  9 14:20:34 2013
@@ -86,7 +86,7 @@ public class PermissionProviderImplTest 
     protected ConfigurationParameters getSecurityConfigParameters() {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(PermissionConstants.PARAM_READ_PATHS, READ_PATHS);
-        map.put(PermissionConstants.PARAM_ADMINISTRATOR_PRINCIPALS, new 
String[] {ADMINISTRATOR_GROUP});
+        map.put(PermissionConstants.PARAM_ADMINISTRATIVE_PRINCIPALS, new 
String[] {ADMINISTRATOR_GROUP});
         ConfigurationParameters acConfig = new ConfigurationParameters(map);
 
         return new 
ConfigurationParameters(ImmutableMap.of(AuthorizationConfiguration.NAME, 
acConfig));