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/02/26 18:42:11 UTC
svn commit: r1450302 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak:
security/authentication/ security/user/ spi/security/authentication/
spi/security/user/
Author: angela
Date: Tue Feb 26 17:42:11 2013
New Revision: 1450302
URL: http://svn.apache.org/r1450302
Log:
OAK-17: work in progress
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java
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/authentication/AuthenticationConfiguration.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/authentication/AuthenticationConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java?rev=1450302&r1=1450301&r2=1450302&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImpl.java Tue Feb 26 17:42:11 2013
@@ -41,8 +41,6 @@ public class AuthenticationConfiguration
private static final Logger log = LoggerFactory.getLogger(AuthenticationConfigurationImpl.class);
- public static final String PARAM_AUTHENTICATION_OPTIONS = "org.apache.jackrabbit.oak.authentication.options";
- public static final String PARAM_APP_NAME = "org.apache.jackrabbit.oak.auth.appName";
private static final String DEFAULT_APP_NAME = "jackrabbit.oak";
public static final String PARAM_TOKEN_OPTIONS = "org.apache.jackrabbit.oak.token.options";
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=1450302&r1=1450301&r2=1450302&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 Tue Feb 26 17:42:11 2013
@@ -42,8 +42,6 @@ import org.apache.jackrabbit.oak.spi.xml
*/
public class UserConfigurationImpl extends SecurityConfiguration.Default implements UserConfiguration {
- public static final String PARAM_USER_OPTIONS = "org.apache.jackrabbit.oak.user.options";
-
private final ConfigurationParameters config;
private final SecurityProvider securityProvider;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java?rev=1450302&r1=1450301&r2=1450302&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthenticationConfiguration.java Tue Feb 26 17:42:11 2013
@@ -30,6 +30,9 @@ import org.apache.jackrabbit.oak.spi.sta
*/
public interface AuthenticationConfiguration extends SecurityConfiguration {
+ String PARAM_AUTHENTICATION_OPTIONS = "org.apache.jackrabbit.oak.authentication.options";
+ String PARAM_APP_NAME = "org.apache.jackrabbit.oak.auth.appName";
+
// TODO review again
@Nonnull
LoginContextProvider getLoginContextProvider(NodeStore nodeStore, CommitHook commitHook, QueryIndexProvider indexProvider);
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=1450302&r1=1450301&r2=1450302&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 Tue Feb 26 17:42:11 2013
@@ -30,6 +30,8 @@ import org.apache.jackrabbit.oak.spi.sec
*/
public interface UserConfiguration extends SecurityConfiguration {
+ String PARAM_USER_OPTIONS = "org.apache.jackrabbit.oak.user.options";
+
@Nonnull
AuthorizableActionProvider getAuthorizableActionProvider();