From oak-commits-return-1405-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Fri Aug 17 14:25:32 2012 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 85769D559 for ; Fri, 17 Aug 2012 14:25:32 +0000 (UTC) Received: (qmail 88371 invoked by uid 500); 17 Aug 2012 14:25:32 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 88354 invoked by uid 500); 17 Aug 2012 14:25: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 88346 invoked by uid 99); 17 Aug 2012 14:25:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Aug 2012 14:25: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; Fri, 17 Aug 2012 14:25:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B46F6238890D; Fri, 17 Aug 2012 14:24:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1374282 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java Date: Fri, 17 Aug 2012 14:24:47 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120817142447.B46F6238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri Aug 17 14:24:47 2012 New Revision: 1374282 URL: http://svn.apache.org/viewvc?rev=1374282&view=rev Log: OAK-50 : Implement User Management (WIP) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java?rev=1374282&r1=1374281&r2=1374282&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidatorProvider.java Fri Aug 17 14:24:47 2012 @@ -18,9 +18,9 @@ package org.apache.jackrabbit.oak.securi import javax.annotation.Nonnull; -import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.CoreValueFactory; import org.apache.jackrabbit.oak.core.ReadOnlyTree; +import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider; import org.apache.jackrabbit.oak.spi.security.user.UserManagerConfig; @@ -32,14 +32,14 @@ import org.apache.jackrabbit.oak.util.No */ public class UserValidatorProvider implements ValidatorProvider { - private final ContentSession contentSession; + private final CoreValueFactory valueFactory; private final UserManagerConfig config; - public UserValidatorProvider(ContentSession contentSession, UserManagerConfig config) { - assert contentSession != null; + public UserValidatorProvider(CoreValueFactory valueFactory, UserManagerConfig config) { + assert valueFactory != null; assert config != null; - this.contentSession = contentSession; + this.valueFactory = valueFactory; this.config = config; } //--------------------------------------------------< ValidatorProvider >--- @@ -47,8 +47,8 @@ public class UserValidatorProvider imple @Override public Validator getRootValidator(NodeState before, NodeState after) { - NodeUtil rootBefore = new NodeUtil(new ReadOnlyTree(before), contentSession); - NodeUtil rootAfter = new NodeUtil(new ReadOnlyTree(after), contentSession); + NodeUtil rootBefore = new NodeUtil(new ReadOnlyTree(before), valueFactory, NamePathMapper.DEFAULT); + NodeUtil rootAfter = new NodeUtil(new ReadOnlyTree(after), valueFactory, NamePathMapper.DEFAULT); return new UserValidator(rootBefore, rootAfter, this); } @@ -61,11 +61,6 @@ public class UserValidatorProvider imple @Nonnull CoreValueFactory getValueFactory() { - return contentSession.getCoreValueFactory(); - } - - @Nonnull - ContentSession getContentSession() { - return contentSession; + return valueFactory; } } \ No newline at end of file