From oak-commits-return-1353-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Aug 14 08:46: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 EAB58DC05 for ; Tue, 14 Aug 2012 08:46:31 +0000 (UTC) Received: (qmail 59369 invoked by uid 500); 14 Aug 2012 08:46:31 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 59328 invoked by uid 500); 14 Aug 2012 08:46:31 -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 59320 invoked by uid 99); 14 Aug 2012 08:46:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2012 08:46:31 +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, 14 Aug 2012 08:46:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D32AC238890D; Tue, 14 Aug 2012 08:45:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372781 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: security/user/UserValidatorProvider.java util/NodeUtil.java Date: Tue, 14 Aug 2012 08:45:42 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120814084542.D32AC238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Aug 14 08:45:42 2012 New Revision: 1372781 URL: http://svn.apache.org/viewvc?rev=1372781&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 jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.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=1372781&r1=1372780&r2=1372781&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 Tue Aug 14 08:45:42 2012 @@ -21,7 +21,6 @@ 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; @@ -40,11 +39,9 @@ public class UserValidatorProvider imple @Nonnull @Override public Validator getRootValidator(NodeState before, NodeState after) { - NamePathMapper mapper = new NamePathMapper.Default(); - CoreValueFactory vf = contentSession.getCoreValueFactory(); - NodeUtil rootBefore = new NodeUtil(vf, mapper, new ReadOnlyTree(before)); - NodeUtil rootAfter = new NodeUtil(vf, mapper, new ReadOnlyTree(after)); + NodeUtil rootBefore = new NodeUtil(new ReadOnlyTree(before), contentSession); + NodeUtil rootAfter = new NodeUtil(new ReadOnlyTree(after), contentSession); return new UserValidator(rootBefore, rootAfter, this); } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java?rev=1372781&r1=1372780&r2=1372781&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/util/NodeUtil.java Tue Aug 14 08:45:42 2012 @@ -28,11 +28,13 @@ import javax.jcr.ValueFactory; import com.google.common.collect.Lists; import org.apache.jackrabbit.JcrConstants; +import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.CoreValue; import org.apache.jackrabbit.oak.api.CoreValueFactory; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.namepath.NameMapper; +import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,6 +57,12 @@ public class NodeUtil { this.tree = tree; } + public NodeUtil(Tree tree, ContentSession contentSession) { + this.tree = tree; + this.factory = contentSession.getCoreValueFactory(); + this.mapper = new NamePathMapper.Default(); + } + @Nonnull public Tree getTree() { return tree;