Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FA25DF8B for ; Mon, 29 Oct 2012 17:35:15 +0000 (UTC) Received: (qmail 85451 invoked by uid 500); 29 Oct 2012 17:35:15 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 85400 invoked by uid 500); 29 Oct 2012 17:35:14 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 85385 invoked by uid 99); 29 Oct 2012 17:35:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 17:35:13 +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; Mon, 29 Oct 2012 17:35:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CB4A2388A3F; Mon, 29 Oct 2012 17:34:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1403440 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/ Date: Mon, 29 Oct 2012 17:34:26 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121029173426.7CB4A2388A3F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Mon Oct 29 17:34:25 2012 New Revision: 1403440 URL: http://svn.apache.org/viewvc?rev=1403440&view=rev Log: JCR-3439: let PrincipalManagerImpl.CheckedGroup implement JackrabbitPrincipal (also improve equals() method) (ported to 2.2) Added: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java - copied unchanged from r1403408, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java Modified: jackrabbit/branches/2.2/ (props changed) jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/TestAll.java Propchange: jackrabbit/branches/2.2/ ------------------------------------------------------------------------------ Merged /jackrabbit/trunk:r1403408 Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java?rev=1403440&r1=1403439&r2=1403440&view=diff ============================================================================== --- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java (original) +++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java Mon Oct 29 17:34:25 2012 @@ -28,6 +28,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal; +import org.apache.jackrabbit.api.security.principal.JackrabbitPrincipal; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; @@ -211,7 +212,7 @@ public class PrincipalManagerImpl implem * due to the fact, that the principal provider is not bound to a particular * Session object. */ - private class CheckedGroup implements Group { + private class CheckedGroup implements Group, JackrabbitPrincipal { final Group delegatee; private final PrincipalProvider provider; @@ -258,7 +259,7 @@ public class PrincipalManagerImpl implem @Override public boolean equals(Object obj) { - return delegatee.equals(obj); + return delegatee.equals(obj instanceof CheckedGroup ? ((CheckedGroup) obj).delegatee : obj); } } Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/TestAll.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/TestAll.java?rev=1403440&r1=1403439&r2=1403440&view=diff ============================================================================== --- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/TestAll.java (original) +++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/TestAll.java Mon Oct 29 17:34:25 2012 @@ -37,7 +37,8 @@ public class TestAll extends TestCase { suite.addTestSuite(AbstractPrincipalProviderTest.class); suite.addTestSuite(EveryonePrincipalTest.class); - + suite.addTestSuite(PrincipalManagerTest.class); + return suite; } }