From commits-return-13735-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Oct 30 16:38:51 2012 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 E34BFD6F3 for ; Tue, 30 Oct 2012 16:38:50 +0000 (UTC) Received: (qmail 25255 invoked by uid 500); 30 Oct 2012 16:38:50 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 25070 invoked by uid 500); 30 Oct 2012 16:38:48 -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 25024 invoked by uid 99); 30 Oct 2012 16:38:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2012 16:38:48 +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, 30 Oct 2012 16:38:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A588F23888E3; Tue, 30 Oct 2012 16:38:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1403774 - in /jackrabbit/branches/2.2: ./ jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java Date: Tue, 30 Oct 2012 16:38:01 -0000 To: commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121030163801.A588F23888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Tue Oct 30 16:38:01 2012 New Revision: 1403774 URL: http://svn.apache.org/viewvc?rev=1403774&view=rev Log: JCR-3439: remove @override annotations for JDK 1.5 compat (ported to 2.2) Modified: jackrabbit/branches/2.2/ (props changed) jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java (contents, props changed) Propchange: jackrabbit/branches/2.2/ ------------------------------------------------------------------------------ Merged /jackrabbit/trunk:r1403768 Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java?rev=1403774&r1=1403773&r2=1403774&view=diff ============================================================================== --- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java (original) +++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java Tue Oct 30 16:38:01 2012 @@ -39,32 +39,26 @@ public class PrincipalManagerTest extend private static class CustomPrincipalProvider extends AbstractPrincipalProvider { - @Override protected Principal providePrincipal(String principalName) { return TESTGROUP_NAME.equals(principalName) ? TESTGROUP : null; } - @Override public PrincipalIterator findPrincipals(String simpleFilter) { throw new UnsupportedOperationException(); } - @Override public PrincipalIterator findPrincipals(String simpleFilter, int searchType) { throw new UnsupportedOperationException(); } - @Override public PrincipalIterator getPrincipals(int searchType) { throw new UnsupportedOperationException(); } - @Override public PrincipalIterator getGroupMembership(Principal principal) { throw new UnsupportedOperationException(); } - @Override public boolean canReadPrincipal(Session session, Principal principalToRead) { return true; } Propchange: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerTest.java ------------------------------------------------------------------------------ svn:eol-style = native