Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 88743 invoked from network); 16 Sep 2005 05:42:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Sep 2005 05:42:38 -0000 Received: (qmail 39945 invoked by uid 500); 16 Sep 2005 05:42:36 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39889 invoked by uid 500); 16 Sep 2005 05:42:36 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39875 invoked by uid 99); 16 Sep 2005 05:42:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Sep 2005 22:42:36 -0700 X-ASF-Spam-Status: No, hits=-9.8 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.29) with SMTP; Thu, 15 Sep 2005 22:42:46 -0700 Received: (qmail 88695 invoked by uid 65534); 16 Sep 2005 05:42:34 -0000 Message-ID: <20050916054234.88694.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r289387 - in /directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl: ACIItem.java ItemFirstACIItem.java Permission.java UserFirstACIItem.java Date: Fri, 16 Sep 2005 05:42:33 -0000 To: commits@directory.apache.org From: trustin@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trustin Date: Thu Sep 15 22:42:29 2005 New Revision: 289387 URL: http://svn.apache.org/viewcvs?rev=289387&view=rev Log: * Fixed a typo error in ItemPermission * Added ACIItem.toTuples() and its implementations Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ACIItem.java directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ItemFirstACIItem.java directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/Permission.java directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/UserFirstACIItem.java Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ACIItem.java URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ACIItem.java?rev=289387&r1=289386&r2=289387&view=diff ============================================================================== --- directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ACIItem.java (original) +++ directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ACIItem.java Thu Sep 15 22:42:29 2005 @@ -19,6 +19,7 @@ package org.apache.ldap.common.acl; import java.io.Serializable; +import java.util.Collection; public abstract class ACIItem implements Serializable { @@ -64,4 +65,6 @@ { return authenticationLevel; } + + public abstract Collection toTuples(); } Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ItemFirstACIItem.java URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ItemFirstACIItem.java?rev=289387&r1=289386&r2=289387&view=diff ============================================================================== --- directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ItemFirstACIItem.java (original) +++ directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/ItemFirstACIItem.java Thu Sep 15 22:42:29 2005 @@ -18,7 +18,10 @@ */ package org.apache.ldap.common.acl; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; public class ItemFirstACIItem extends ACIItem @@ -74,5 +77,38 @@ "authenticationLevel=" + getAuthenticationLevel() + ", " + "protectedItems=" + protectedItems + ", " + "itemPermissions=" + itemPermissions; + } + + public Collection toTuples() + { + Collection tuples = new ArrayList(); + for( Iterator i = itemPermissions.iterator(); i.hasNext(); ) + { + ItemPermission itemPermission = ( ItemPermission ) i.next(); + Set grants = itemPermission.getGrants(); + Set denials = itemPermission.getDenials(); + int precedence = itemPermission.getPrecedence() >= 0? + itemPermission.getPrecedence() : this.getPrecedence(); + + if( grants.size() > 0 ) + { + tuples.add( new ACITuple( + itemPermission.getUserClasses(), + getAuthenticationLevel(), + getProtectedItems(), + grants, + precedence ) ); + } + if( denials.size() > 0 ) + { + tuples.add( new ACITuple( + itemPermission.getUserClasses(), + getAuthenticationLevel(), + getProtectedItems(), + denials, + precedence ) ); + } + } + return tuples; } } Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/Permission.java URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/Permission.java?rev=289387&r1=289386&r2=289387&view=diff ============================================================================== --- directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/Permission.java (original) +++ directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/Permission.java Thu Sep 15 22:42:29 2005 @@ -25,7 +25,8 @@ public abstract class Permission implements Serializable { private int precedence = -1; - private Set grantsAndDenials = new HashSet(); + private Set grants = new HashSet(); + private Set denials = new HashSet(); protected Permission() { @@ -47,16 +48,43 @@ public boolean add( GrantAndDenial gad ) { - return grantsAndDenials.add( gad ); + if( gad.isGrant() ) + { + return grants.add( gad ); + } + else + { + return denials.add( gad ); + } } public boolean remove( GrantAndDenial gad ) { - return grantsAndDenials.remove( gad ); + if( gad.isGrant() ) + { + return grants.remove( gad ); + } + else + { + return denials.remove( gad ); + } } public Set getGrantsAndDenials() { - return new HashSet( grantsAndDenials ); + Set result = new HashSet( grants.size() + denials.size() ); + result.addAll( grants ); + result.addAll( denials ); + return result; + } + + public Set getGrants() + { + return new HashSet( grants ); + } + + public Set getDenials() + { + return new HashSet( grants ); } } Modified: directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/UserFirstACIItem.java URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/UserFirstACIItem.java?rev=289387&r1=289386&r2=289387&view=diff ============================================================================== --- directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/UserFirstACIItem.java (original) +++ directory/shared/ldap/trunk/common/src/java/org/apache/ldap/common/acl/UserFirstACIItem.java Thu Sep 15 22:42:29 2005 @@ -18,7 +18,10 @@ */ package org.apache.ldap.common.acl; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; public class UserFirstACIItem extends ACIItem @@ -46,7 +49,7 @@ return userClasses.remove( userClass ); } - public Set getUserClass() + public Set getUserClasses() { return new HashSet( userClasses ); } @@ -74,5 +77,38 @@ "authenticationLevel=" + getAuthenticationLevel() + ", " + "userClasses=" + userClasses + ", " + "userPermissions=" + userPermissions; + } + + public Collection toTuples() + { + Collection tuples = new ArrayList(); + for( Iterator i = userPermissions.iterator(); i.hasNext(); ) + { + UserPermission userPermission = ( UserPermission ) i.next(); + Set grants = userPermission.getGrants(); + Set denials = userPermission.getDenials(); + int precedence = userPermission.getPrecedence() >= 0? + userPermission.getPrecedence() : this.getPrecedence(); + + if( grants.size() > 0 ) + { + tuples.add( new ACITuple( + getUserClasses(), + getAuthenticationLevel(), + userPermission.getProtectedItems(), + grants, + precedence ) ); + } + if( denials.size() > 0 ) + { + tuples.add( new ACITuple( + getUserClasses(), + getAuthenticationLevel(), + userPermission.getProtectedItems(), + denials, + precedence ) ); + } + } + return tuples; } }