Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 42924 invoked from network); 1 Oct 2004 05:19:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 1 Oct 2004 05:19:35 -0000 Received: (qmail 59229 invoked by uid 500); 1 Oct 2004 05:19:34 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 59183 invoked by uid 500); 1 Oct 2004 05:19:33 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 59161 invoked by uid 99); 1 Oct 2004 05:19:33 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 30 Sep 2004 22:19:33 -0700 Received: (qmail 42862 invoked by uid 65534); 1 Oct 2004 05:19:32 -0000 Date: 1 Oct 2004 05:19:32 -0000 Message-ID: <20041001051932.42850.qmail@minotaur.apache.org> From: vtence@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 47630 - in incubator/directory/janus/trunk/sandbox/src: java/org/apache/janus/authorization java/org/apache/janus/authorization/effect test/org/apache/janus/authorization X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: vtence Date: Thu Sep 30 22:19:31 2004 New Revision: 47630 Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Effect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Policy.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/GrantEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/IndeterminateEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java incubator/directory/janus/trunk/sandbox/src/test/org/apache/janus/authorization/PolicyTest.java Log: Rename refactoring Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Effect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Effect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Effect.java Thu Sep 30 22:19:31 2004 @@ -21,7 +21,7 @@ */ public interface Effect { - Effect and( Effect effect ); + Effect integrate( Effect effect ); Effect derive( Effect effect ); Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Policy.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Policy.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/Policy.java Thu Sep 30 22:19:31 2004 @@ -48,7 +48,7 @@ { Rule rule = ( Rule ) it.next(); Effect effect = rule.evaluate( s, p ); - decision = decision.and( effect ); + decision = decision.integrate( effect ); } return decision; Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyEffect.java Thu Sep 30 22:19:31 2004 @@ -23,7 +23,7 @@ */ public final class DenyEffect implements Effect { - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return this; } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/DenyOverridesEffect.java Thu Sep 30 22:19:31 2004 @@ -35,7 +35,7 @@ m_effect = effect; } - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return effect.derive( this ); } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/FirstApplicableEffect.java Thu Sep 30 22:19:31 2004 @@ -35,7 +35,7 @@ m_effect = effect; } - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return effect.derive( this ); } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/GrantEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/GrantEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/GrantEffect.java Thu Sep 30 22:19:31 2004 @@ -23,7 +23,7 @@ */ public final class GrantEffect implements Effect { - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return this; } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/IndeterminateEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/IndeterminateEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/IndeterminateEffect.java Thu Sep 30 22:19:31 2004 @@ -23,7 +23,7 @@ */ public final class IndeterminateEffect implements Effect { - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return this; } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/LastApplicableEffect.java Thu Sep 30 22:19:31 2004 @@ -35,7 +35,7 @@ m_effect = effect; } - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return effect.derive( this ); } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/NotApplicableEffect.java Thu Sep 30 22:19:31 2004 @@ -23,7 +23,7 @@ */ public final class NotApplicableEffect implements Effect { - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return this; } Modified: incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java (original) +++ incubator/directory/janus/trunk/sandbox/src/java/org/apache/janus/authorization/effect/PermitOverridesEffect.java Thu Sep 30 22:19:31 2004 @@ -35,7 +35,7 @@ m_effect = effect; } - public Effect and( Effect effect ) + public Effect integrate( Effect effect ) { return effect.derive( this ); } Modified: incubator/directory/janus/trunk/sandbox/src/test/org/apache/janus/authorization/PolicyTest.java ============================================================================== --- incubator/directory/janus/trunk/sandbox/src/test/org/apache/janus/authorization/PolicyTest.java (original) +++ incubator/directory/janus/trunk/sandbox/src/test/org/apache/janus/authorization/PolicyTest.java Thu Sep 30 22:19:31 2004 @@ -26,8 +26,8 @@ policy.addRule( new PrimitiveRule( new GrantEffect() )); policy.addRule( new PrimitiveRule( new DenyEffect() )); - mockEffect.expects( once() ).method( "and" ).with( isA(GrantEffect.class) ).will( returnValue( effect(mockEffect) )); - mockEffect.expects( once() ).method( "and" ).with( isA(DenyEffect.class) ).will( returnValue( effect(mockEffect) )); + mockEffect.expects( once() ).method( "integrate" ).with( isA(GrantEffect.class) ).will( returnValue( effect(mockEffect) )); + mockEffect.expects( once() ).method( "integrate" ).with( isA(DenyEffect.class) ).will( returnValue( effect(mockEffect) )); policy.evaluate( new Subject(), new BasicPermission( "doSomething" ) ); mockEffect.verify();