Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 94698 invoked from network); 19 Nov 2006 18:38:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Nov 2006 18:38:53 -0000 Received: (qmail 67444 invoked by uid 500); 19 Nov 2006 18:39:03 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67391 invoked by uid 500); 19 Nov 2006 18:39:03 -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 67380 invoked by uid 99); 19 Nov 2006 18:39:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Nov 2006 10:39:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Nov 2006 10:38:52 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id D16601A9851; Sun, 19 Nov 2006 10:38:19 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r476876 - in /directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core: operational/OperationalAttributeService.java partition/DefaultPartitionNexus.java partition/impl/btree/BTreeSearchResultEnumeration.java Date: Sun, 19 Nov 2006 18:38:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061119183819.D16601A9851@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Nov 19 10:38:19 2006 New Revision: 476876 URL: http://svn.apache.org/viewvc?view=rev&rev=476876 Log: Changed the UsageTypeEnum to become an enum instead of an subclass of ValuedEnum (Java 5 migration) Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=476876&r1=476875&r2=476876 ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Sun Nov 19 10:38:19 2006 @@ -321,7 +321,7 @@ type = registry.lookup( attrId ); } - if ( type != null && type.getUsage() != UsageEnum.USERAPPLICATIONS ) + if ( type != null && type.getUsage() != UsageEnum.USER_APPLICATIONS ) { attributes.remove( attrId ); } Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=476876&r1=476875&r2=476876 ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sun Nov 19 10:38:19 2006 @@ -809,7 +809,7 @@ // add all user attribute Attribute attr = ( Attribute ) ii.next(); AttributeType type = attrRegistry.lookup( attr.getID() ); - if ( type.getUsage() == UsageEnum.USERAPPLICATIONS ) + if ( type.getUsage() == UsageEnum.USER_APPLICATIONS ) { attrs.put( attr ); } @@ -827,7 +827,7 @@ // add all operational attributes Attribute attr = ( Attribute ) ii.next(); AttributeType type = attrRegistry.lookup( attr.getID() ); - if ( type.getUsage() != UsageEnum.USERAPPLICATIONS ) + if ( type.getUsage() != UsageEnum.USER_APPLICATIONS ) { attrs.put( attr ); } Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=476876&r1=476875&r2=476876 ============================================================================== --- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java (original) +++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java Sun Nov 19 10:38:19 2006 @@ -144,7 +144,7 @@ { String attrId = ( String ) list.next(); AttributeType attrType = registry.lookup( attrId ); - if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS ) + if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS ) { continue; } @@ -181,7 +181,7 @@ { String attrId = ( String ) list.next(); AttributeType attrType = registry.lookup( attrId ); - if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS ) + if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS ) { Attribute attr = ( Attribute ) rec.getAttributes().get( attrId ).clone(); entry.put( attr );