From oak-commits-return-726-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Wed May 9 16:36:35 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 887B8C8AF for ; Wed, 9 May 2012 16:36:35 +0000 (UTC) Received: (qmail 69084 invoked by uid 500); 9 May 2012 16:36:35 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 69064 invoked by uid 500); 9 May 2012 16:36:35 -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-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 69056 invoked by uid 99); 9 May 2012 16:36:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 May 2012 16:36:35 +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; Wed, 09 May 2012 16:36:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C3B0D2388865; Wed, 9 May 2012 16:36:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1336286 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java Date: Wed, 09 May 2012 16:36:13 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120509163613.C3B0D2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed May 9 16:36:13 2012 New Revision: 1336286 URL: http://svn.apache.org/viewvc?rev=1336286&view=rev Log: OAK-90 - Implement Principal Management (WIP) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java?rev=1336286&r1=1336285&r2=1336286&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/KernelPrincipalProvider.java Wed May 9 16:36:13 2012 @@ -40,7 +40,8 @@ public class KernelPrincipalProvider imp @Override public Principal getPrincipal(final String principalName) { - // TODO + // TODO: use user-defined query to search for a principalName property + // TODO that is defined by a user/group node. return new Principal() { @Override public String getName() { Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java?rev=1336286&r1=1336285&r2=1336286&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/principal/PrincipalManagerImpl.java Wed May 9 16:36:13 2012 @@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.jcr.se import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.oak.security.principal.EveryonePrincipal; +import org.apache.jackrabbit.oak.spi.security.principal.PrincipalProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,16 +35,20 @@ public class PrincipalManagerImpl implem */ private static final Logger log = LoggerFactory.getLogger(PrincipalManagerImpl.class); + private final PrincipalProvider principalProvider; + + public PrincipalManagerImpl(PrincipalProvider principalProvider) { + this.principalProvider = principalProvider; + } + @Override public boolean hasPrincipal(String principalName) { - // TODO - return false; + return principalProvider.getPrincipal(principalName) != null; } @Override public Principal getPrincipal(String principalName) { - // TODO - return null; + return principalProvider.getPrincipal(principalName); } @Override @@ -66,8 +71,7 @@ public class PrincipalManagerImpl implem @Override public PrincipalIterator getGroupMembership(Principal principal) { - // TODO - return null; + return new PrincipalIteratorAdapter(principalProvider.getGroupMembership(principal)); } @Override