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/05/10 16:16:10 UTC
svn commit: r1481019 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: security/user/UserConfigurationImpl.java spi/security/user/UserConfiguration.java

Author: angela
Date: Fri May 10 14:16:09 2013
New Revision: 1481019

URL: http://svn.apache.org/r1481019
Log:
OAK-50 : Implement User Management (minor improvement, javadoc)

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java?rev=1481019&r1=1481018&r2=1481019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java Fri May 10 14:16:09 2013
@@ -83,15 +83,15 @@ public class UserConfigurationImpl exten
     //--------------------------------------------------< UserConfiguration >---
     @Nonnull
     @Override
-    public AuthorizableActionProvider getAuthorizableActionProvider() {
-        // TODO OAK-521: add proper implementation
-        AuthorizableActionProvider defProvider = new DefaultAuthorizableActionProvider(securityProvider, config);
-        return config.getConfigValue(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, defProvider);
+    public UserManager getUserManager(Root root, NamePathMapper namePathMapper) {
+        return new UserManagerImpl(root, namePathMapper, securityProvider);
     }
 
     @Nonnull
     @Override
-    public UserManager getUserManager(Root root, NamePathMapper namePathMapper) {
-        return new UserManagerImpl(root, namePathMapper, securityProvider);
+    public AuthorizableActionProvider getAuthorizableActionProvider() {
+        // TODO OAK-521: add proper implementation
+        AuthorizableActionProvider defProvider = new DefaultAuthorizableActionProvider(securityProvider, config);
+        return config.getConfigValue(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, defProvider);
     }
 }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java?rev=1481019&r1=1481018&r2=1481019&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConfiguration.java Fri May 10 14:16:09 2013
@@ -25,16 +25,15 @@ import org.apache.jackrabbit.oak.spi.sec
 import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider;
 
 /**
- * UserConfiguration...
- * TODO: OAK-522
+ * Configuration interface for user management.
  */
 public interface UserConfiguration extends SecurityConfiguration {
 
     String PARAM_USER_OPTIONS = "org.apache.jackrabbit.oak.user.options";
 
     @Nonnull
-    AuthorizableActionProvider getAuthorizableActionProvider();
+    UserManager getUserManager(Root root, NamePathMapper namePathMapper);
 
     @Nonnull
-    UserManager getUserManager(Root root, NamePathMapper namePathMapper);
+    AuthorizableActionProvider getAuthorizableActionProvider();
 }
\ No newline at end of file