Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D20D9EC7F for ; Tue, 26 Feb 2013 17:42:32 +0000 (UTC) Received: (qmail 94573 invoked by uid 500); 26 Feb 2013 17:42:32 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 94552 invoked by uid 500); 26 Feb 2013 17:42:32 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 94539 invoked by uid 99); 26 Feb 2013 17:42:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Feb 2013 17:42:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Feb 2013 17:42:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2159423888EA; Tue, 26 Feb 2013 17:42:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Tue, 26 Feb 2013 17:42:11 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130226174212.2159423888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();