svn commit: r1521841 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java

[angela]

Author: angela
Date: Wed Sep 11 13:46:45 2013
New Revision: 1521841

URL: http://svn.apache.org/r1521841
Log:
OAK-754         : Pluggable Security Setup  (WIP, consistent method naming)

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1521841&r1=1521840&r2=1521841&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
 Wed Sep 11 13:46:45 2013
@@ -57,7 +57,7 @@ public class SecurityProviderImpl implem
     public Iterable<? extends SecurityConfiguration> getConfigurations() {
         Set<SecurityConfiguration> scs = new HashSet<SecurityConfiguration>();
         scs.add(getAuthenticationConfiguration());
-        scs.add(getAccessControlConfiguration());
+        scs.add(getAuthorizationConfiguration());
         scs.add(getUserConfiguration());
         scs.add(getPrincipalConfiguration());
         scs.add(getPrivilegeConfiguration());
@@ -70,7 +70,7 @@ public class SecurityProviderImpl implem
         if (AuthenticationConfiguration.class == configClass) {
             return (T) getAuthenticationConfiguration();
         } else if (AuthorizationConfiguration.class == configClass) {
-            return (T) getAccessControlConfiguration();
+            return (T) getAuthorizationConfiguration();
         } else if (UserConfiguration.class == configClass) {
             return (T) getUserConfiguration();
         } else if (PrincipalConfiguration.class == configClass) {
@@ -88,7 +88,7 @@ public class SecurityProviderImpl implem
     }
 
     @Nonnull
-    private AuthorizationConfiguration getAccessControlConfiguration() {
+    private AuthorizationConfiguration getAuthorizationConfiguration() {
         return new AuthorizationConfigurationImpl(this);
     }