Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 9549 invoked from network); 12 Mar 2011 18:55:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Mar 2011 18:55:59 -0000 Received: (qmail 61527 invoked by uid 500); 12 Mar 2011 18:55:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 61470 invoked by uid 500); 12 Mar 2011 18:55:59 -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 61463 invoked by uid 99); 12 Mar 2011 18:55:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Mar 2011 18:55:59 +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; Sat, 12 Mar 2011 18:55:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 753842388A9C; Sat, 12 Mar 2011 18:55:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1080975 [1/2] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ ... Date: Sat, 12 Mar 2011 18:55:30 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110312185531.753842388A9C@eris.apache.org> Author: akarasulu Date: Sat Mar 12 18:55:29 2011 New Revision: 1080975 URL: http://svn.apache.org/viewvc?rev=1080975&view=rev Log: renaming ldap comparator to get it out of the way Added: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractLdapComparator.java - copied, changed from r1080405, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java Removed: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original) +++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Sat Mar 12 18:55:29 2011 @@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.entry.Value; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.LdapSyntax; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl; import org.apache.directory.shared.ldap.model.schema.MatchingRule; @@ -135,7 +135,7 @@ public class TestServerEntryUtils matchingRule.setSyntax( syntax ); - matchingRule.setLdapComparator( new LdapComparator( matchingRule.getOid() ) + matchingRule.setLdapComparator( new AbstractLdapComparator( matchingRule.getOid() ) { private static final long serialVersionUID = -5428997199906309370L; public int compare( String o1, String o2 ) @@ -220,7 +220,7 @@ public class TestServerEntryUtils matchingRule.setSyntax( syntax ); - matchingRule.setLdapComparator( new LdapComparator( matchingRule.getOid() ) + matchingRule.setLdapComparator( new AbstractLdapComparator( matchingRule.getOid() ) { private static final long serialVersionUID = -5428997199906309370L; public int compare( String o1, String o2 ) Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original) +++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Sat Mar 12 18:55:29 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.name.Rdn; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.registries.Schema; import org.apache.directory.shared.util.Strings; @@ -77,7 +77,7 @@ public class ComparatorSynchronizer exte Entry entry = modifyContext.getEntry(); String schemaName = getSchemaName( name ); String oid = getOid( entry ); - LdapComparator comparator = factory.getLdapComparator( schemaManager, targetEntry, schemaManager + AbstractLdapComparator comparator = factory.getLdapComparator( schemaManager, targetEntry, schemaManager .getRegistries(), schemaName ); if ( isSchemaEnabled( schemaName ) ) @@ -111,7 +111,7 @@ public class ComparatorSynchronizer exte // Build the new Comparator from the given entry String schemaName = getSchemaName( dn ); - LdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), + AbstractLdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), schemaName ); // At this point, the constructed LdapComparator has not been checked against the @@ -167,11 +167,11 @@ public class ComparatorSynchronizer exte } // Test that the Oid exists - LdapComparator comparator = null; + AbstractLdapComparator comparator = null; try { - comparator = ( LdapComparator ) checkComparatorOidExists( entry ); + comparator = ( AbstractLdapComparator ) checkComparatorOidExists( entry ); } catch ( LdapSchemaViolationException lsve ) { @@ -250,7 +250,7 @@ public class ComparatorSynchronizer exte targetEntry.setDn( newDn ); // Register the new comparator, and unregister the old one - LdapComparator comparator = factory.getLdapComparator( schemaManager, targetEntry, schemaManager + AbstractLdapComparator comparator = factory.getLdapComparator( schemaManager, targetEntry, schemaManager .getRegistries(), schemaName ); schemaManager.unregisterComparator( oldOid ); schemaManager.add( comparator ); @@ -275,7 +275,7 @@ public class ComparatorSynchronizer exte String newSchemaName = getSchemaName( newParentName ); - LdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), + AbstractLdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), newSchemaName ); String oldSchemaName = getSchemaName( oriChildName ); @@ -305,7 +305,7 @@ public class ComparatorSynchronizer exte String newSchemaName = getSchemaName( newParentName ); - LdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), + AbstractLdapComparator comparator = factory.getLdapComparator( schemaManager, entry, schemaManager.getRegistries(), newSchemaName ); String oldSchemaName = getSchemaName( oriChildName ); @@ -348,13 +348,13 @@ public class ComparatorSynchronizer exte * Check that a Comparator exists in the ComparatorRegistry, and if so, * return it. */ - protected LdapComparator checkComparatorOidExists( Entry entry ) throws LdapException + protected AbstractLdapComparator checkComparatorOidExists( Entry entry ) throws LdapException { String oid = getOid( entry ); if ( schemaManager.getComparatorRegistry().contains( oid ) ) { - return ( LdapComparator ) schemaManager.getComparatorRegistry().get( oid ); + return ( AbstractLdapComparator ) schemaManager.getComparatorRegistry().get( oid ); } else { Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original) +++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Sat Mar 12 18:55:29 2011 @@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.filter.SubstringNode; import org.apache.directory.shared.ldap.model.name.Dn; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -320,7 +320,7 @@ public class LeafEvaluator implements Ev * @return the comparator for equality matching * @throws LdapException if there is a failure */ - private LdapComparator getComparator( AttributeType attributeType ) throws LdapException + private AbstractLdapComparator getComparator( AttributeType attributeType ) throws LdapException { MatchingRule mrule = getMatchingRule( attributeType, EQUALITY_MATCH ); Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java (original) +++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java Sat Mar 12 18:55:29 2011 @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.DITContentRule; import org.apache.directory.shared.ldap.model.schema.DITStructureRule; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.LdapSyntax; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl; import org.apache.directory.shared.ldap.model.schema.MatchingRule; @@ -169,7 +169,7 @@ public class AttributesFactory } - public Entry getAttributes( String oid, LdapComparator comparator, Schema schema, SchemaManager schemaManager ) + public Entry getAttributes( String oid, AbstractLdapComparator comparator, Schema schema, SchemaManager schemaManager ) { Entry entry = new DefaultEntry( schemaManager ); Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java (original) +++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java Sat Mar 12 18:55:29 2011 @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.DITContentRule; import org.apache.directory.shared.ldap.model.schema.DITStructureRule; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax; import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse; @@ -110,7 +110,7 @@ public class DefaultSchemaService implem EntryAttribute attr = new DefaultEntryAttribute( getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.COMPARATORS_AT ) ); - for ( LdapComparator comparator : getSchemaManager().getComparatorRegistry() ) + for ( AbstractLdapComparator comparator : getSchemaManager().getComparatorRegistry() ) { attr.add( SchemaUtils.render( comparator ) ); } Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original) +++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Sat Mar 12 18:55:29 2011 @@ -23,7 +23,7 @@ package org.apache.directory.server.core import java.util.Iterator; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription; import org.apache.directory.shared.ldap.model.schema.registries.DefaultComparatorRegistry; @@ -40,7 +40,7 @@ class MockComparatorRegistry extends Def super(); } - private LdapComparator comparator = new LdapComparator( "1.1.1" ) + private AbstractLdapComparator comparator = new AbstractLdapComparator( "1.1.1" ) { public int compare( Integer i1, Integer i2 ) { @@ -55,18 +55,18 @@ class MockComparatorRegistry extends Def } - public void register( LdapComparatorDescription description, LdapComparator comparator ) throws LdapException + public void register( LdapComparatorDescription description, AbstractLdapComparator comparator ) throws LdapException { } - public LdapComparator lookup( String oid ) throws LdapException + public AbstractLdapComparator lookup( String oid ) throws LdapException { return comparator; } - public void register( LdapComparator comparator ) throws LdapException + public void register( AbstractLdapComparator comparator ) throws LdapException { } @@ -77,7 +77,7 @@ class MockComparatorRegistry extends Def } - public Iterator> iterator() + public Iterator> iterator() { return null; } @@ -95,7 +95,7 @@ class MockComparatorRegistry extends Def } - public LdapComparator unregister( String oid ) throws LdapException + public AbstractLdapComparator unregister( String oid ) throws LdapException { return this.comparator; } Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original) +++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Sat Mar 12 18:55:29 2011 @@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.cursor.Tuple; import org.apache.directory.shared.ldap.model.entry.BinaryValue; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -84,7 +84,7 @@ public class AvlIndex extends Abst throw new Exception( I18n.err( I18n.ERR_212, attributeType ) ); } - LdapComparator comp = ( LdapComparator ) mr.getLdapComparator(); + AbstractLdapComparator comp = ( AbstractLdapComparator ) mr.getLdapComparator(); /* * The forward key/value map stores attribute values to master table Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java (original) +++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java Sat Mar 12 18:55:29 2011 @@ -25,7 +25,7 @@ import org.apache.directory.server.xdbm. import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.filter.SimpleNode; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -54,7 +54,7 @@ public abstract class LeafEvaluator ldapComparator; + protected AbstractLdapComparator ldapComparator; /** The index to use if any */ protected Index idx; @@ -91,7 +91,7 @@ public abstract class LeafEvaluator getComparator() + public AbstractLdapComparator getComparator() { return ldapComparator; } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java Sat Mar 12 18:55:29 2011 @@ -26,7 +26,7 @@ import java.io.ObjectOutput; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -165,7 +165,7 @@ public abstract class AbstractValue i * @throws LdapException if resolution of schema entities fail */ @SuppressWarnings("unchecked") - protected final LdapComparator getLdapComparator() throws LdapException + protected final AbstractLdapComparator getLdapComparator() throws LdapException { if ( attributeType != null ) { @@ -176,7 +176,7 @@ public abstract class AbstractValue i return null; } - return (LdapComparator)mr.getLdapComparator(); + return (AbstractLdapComparator)mr.getLdapComparator(); } else { Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java Sat Mar 12 18:55:29 2011 @@ -28,7 +28,7 @@ import java.util.Comparator; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.ldap.model.schema.SyntaxChecker; @@ -324,7 +324,7 @@ public class BinaryValue extends Abstrac { try { - LdapComparator comparator = getLdapComparator(); + AbstractLdapComparator comparator = getLdapComparator(); if ( comparator != null ) { Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/EntryUtils.java Sat Mar 12 18:55:29 2011 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl; import org.apache.directory.shared.ldap.model.schema.MatchingRule; import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer; @@ -133,7 +133,7 @@ public class EntryUtils matchingRule.setSyntax( syntax ); - matchingRule.setLdapComparator( new LdapComparator( matchingRule.getOid() ) + matchingRule.setLdapComparator( new AbstractLdapComparator( matchingRule.getOid() ) { private static final long serialVersionUID = 1L; @@ -203,7 +203,7 @@ public class EntryUtils matchingRule.setSyntax( syntax ); - matchingRule.setLdapComparator( new LdapComparator( matchingRule.getOid() ) + matchingRule.setLdapComparator( new AbstractLdapComparator( matchingRule.getOid() ) { private static final long serialVersionUID = 1L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/StringValue.java Sat Mar 12 18:55:29 2011 @@ -26,7 +26,7 @@ import java.io.ObjectOutput; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.schema.AttributeType; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.Normalizer; import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.apache.directory.shared.util.Strings; @@ -407,7 +407,7 @@ public class StringValue extends Abstrac { try { - LdapComparator comparator = getLdapComparator(); + AbstractLdapComparator comparator = getLdapComparator(); // Compare normalized values if ( comparator == null ) Copied: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractLdapComparator.java (from r1080405, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java) URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractLdapComparator.java?p2=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractLdapComparator.java&p1=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java&r1=1080405&r2=1080975&rev=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/LdapComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractLdapComparator.java Sat Mar 12 18:55:29 2011 @@ -30,7 +30,7 @@ import java.util.Comparator; * * @author Apache Directory Project */ -public abstract class LdapComparator extends MutableLoadableSchemaObjectImpl implements Comparator, Serializable +public abstract class AbstractLdapComparator extends MutableLoadableSchemaObjectImpl implements Comparator, Serializable { /** The serial version UID */ private static final long serialVersionUID = 2L; @@ -39,7 +39,7 @@ public abstract class LdapComparator * Create a new instance of a Comparator * @param oid The associated OID */ - protected LdapComparator( String oid ) + protected AbstractLdapComparator( String oid ) { super( SchemaObjectType.COMPARATOR, oid ); } @@ -68,7 +68,7 @@ public abstract class LdapComparator return false; } - return o instanceof LdapComparator; + return o instanceof AbstractLdapComparator; } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java Sat Mar 12 18:55:29 2011 @@ -199,7 +199,7 @@ public final class DescriptionUtils * the Comparator to generate the description for * @return the ComparatorDescription string */ - public static String getDescription( LdapComparator comparator ) + public static String getDescription( AbstractLdapComparator comparator ) { return getLoadableDescription( comparator ); } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/EntityFactory.java Sat Mar 12 18:55:29 2011 @@ -62,7 +62,7 @@ public interface EntityFactory * @return A new instance of a LdapComparator * @throws Exception If the creation has failed */ - LdapComparator getLdapComparator( SchemaManager schemaManager, + AbstractLdapComparator getLdapComparator( SchemaManager schemaManager, LdapComparatorDescription comparatorDescription, Registries targetRegistries, String schemaName ) throws Exception; @@ -77,7 +77,7 @@ public interface EntityFactory * @return the loaded Comparator * @throws LdapException if anything fails during loading */ - LdapComparator getLdapComparator( SchemaManager schemaManager, Entry entry, + AbstractLdapComparator getLdapComparator( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName ) throws LdapException; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MatchingRule.java Sat Mar 12 18:55:29 2011 @@ -93,7 +93,7 @@ public class MatchingRule extends Abstra private static final Logger LOG = LoggerFactory.getLogger( MatchingRule.class ); /** The associated Comparator */ - protected LdapComparator ldapComparator; + protected AbstractLdapComparator ldapComparator; /** The associated Normalizer */ protected MutableNormalizer normalizer; @@ -131,7 +131,7 @@ public class MatchingRule extends Abstra try { // Gets the associated Comparator - ldapComparator = ( LdapComparator ) registries.getComparatorRegistry().lookup( oid ); + ldapComparator = ( AbstractLdapComparator ) registries.getComparatorRegistry().lookup( oid ); } catch ( LdapException ne ) { @@ -317,7 +317,7 @@ public class MatchingRule extends Abstra * @return the ordering LdapComparator * @throws NamingException if there is a failure resolving the object */ - public LdapComparator getLdapComparator() + public AbstractLdapComparator getLdapComparator() { return ldapComparator; } @@ -329,7 +329,7 @@ public class MatchingRule extends Abstra * @param ldapComparator The LdapComparator */ @SuppressWarnings("unchecked") - public void setLdapComparator( LdapComparator ldapComparator ) + public void setLdapComparator( AbstractLdapComparator ldapComparator ) { if ( locked ) { @@ -338,7 +338,7 @@ public class MatchingRule extends Abstra if ( !isReadOnly ) { - this.ldapComparator = ( LdapComparator ) ldapComparator; + this.ldapComparator = ( AbstractLdapComparator ) ldapComparator; } } @@ -349,14 +349,14 @@ public class MatchingRule extends Abstra * @param ldapComparator The LdapComparator */ @SuppressWarnings("unchecked") - public void updateLdapComparator( LdapComparator ldapComparator ) + public void updateLdapComparator( AbstractLdapComparator ldapComparator ) { if ( locked ) { throw new UnsupportedOperationException( I18n.err( I18n.ERR_04441, getName() ) ); } - this.ldapComparator = ( LdapComparator ) ldapComparator; + this.ldapComparator = ( AbstractLdapComparator ) ldapComparator; } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Sat Mar 12 18:55:29 2011 @@ -460,7 +460,7 @@ public interface SchemaManager * @return The found Comparator * @throws LdapException if the OID is not found in the Comparator registry */ - LdapComparator lookupComparatorRegistry( String oid ) throws LdapException; + AbstractLdapComparator lookupComparatorRegistry( String oid ) throws LdapException; /** Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class BitStringComparator extends LdapComparator +public class BitStringComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BooleanComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class BooleanComparator extends LdapComparator +public class BooleanComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ByteArrayComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class ByteArrayComparator extends LdapComparator +public class ByteArrayComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ComparableComparator.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * @author Apache Directory Project * @param the type, must extend {@link Comparable} */ -public class ComparableComparator extends LdapComparator> +public class ComparableComparator extends AbstractLdapComparator> { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnComparator.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.model.entry.StringValue; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class CsnComparator extends LdapComparator +public class CsnComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/CsnSidComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class CsnSidComparator extends LdapComparator +public class CsnSidComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/DnComparator.java Sat Mar 12 18:55:29 2011 @@ -24,7 +24,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class DnComparator extends LdapComparator +public class DnComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java Sat Mar 12 18:55:29 2011 @@ -24,7 +24,7 @@ import java.io.IOException; import java.text.ParseException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.PrepareString; import org.apache.directory.shared.util.GeneralizedTime; import org.slf4j.Logger; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class GeneralizedTimeComparator extends LdapComparator +public class GeneralizedTimeComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java Sat Mar 12 18:55:29 2011 @@ -25,7 +25,7 @@ import java.io.Serializable; import java.math.BigInteger; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.PrepareString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class IntegerComparator extends LdapComparator implements Serializable +public class IntegerComparator extends AbstractLdapComparator implements Serializable { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java Sat Mar 12 18:55:29 2011 @@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap import java.io.Serializable; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; /** @@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class LongComparator extends LdapComparator implements Serializable +public class LongComparator extends AbstractLdapComparator implements Serializable { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NormalizingComparator.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -/* no qualifier*/class NormalizingComparator extends LdapComparator +/* no qualifier*/class NormalizingComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; private AbstractNormalizer normalizer; /** the underlying comparator to use for comparisons */ - private LdapComparator comparator; + private AbstractLdapComparator comparator; /** @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * @param normalizer the Normalizer to normalize values with before comparing * @param comparator the underlying comparator to use for comparisons */ - public NormalizingComparator( String oid, AbstractNormalizer normalizer, LdapComparator comparator ) + public NormalizingComparator( String oid, AbstractNormalizer normalizer, AbstractLdapComparator comparator ) { super( oid ); this.normalizer = normalizer; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java Sat Mar 12 18:55:29 2011 @@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap import java.io.IOException; import org.apache.directory.shared.i18n.I18n; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.PrepareString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class NumericStringComparator extends LdapComparator +public class NumericStringComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectClassTypeComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.util.Strings; @@ -30,7 +30,7 @@ import org.apache.directory.shared.util. * * @author Apache Directory Project */ -public class ObjectClassTypeComparator extends LdapComparator +public class ObjectClassTypeComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class ObjectIdentifierComparator extends LdapComparator +public class ObjectIdentifierComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/ObjectIdentifierFirstComponentComparator.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.asn1.util.OID; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.util.Chars; import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class ObjectIdentifierFirstComponentComparator extends LdapComparator +public class ObjectIdentifierFirstComponentComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java Sat Mar 12 18:55:29 2011 @@ -25,7 +25,7 @@ import java.util.Comparator; import org.apache.directory.shared.i18n.I18n; import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class SerializableComparator extends LdapComparator implements Serializable +public class SerializableComparator extends AbstractLdapComparator implements Serializable { /** The serial version UID */ private static final long serialVersionUID = 2L; @@ -107,7 +107,7 @@ public class SerializableComparator e } } - ((LdapComparator)wrapped).setSchemaManager( schemaManager ); + ((AbstractLdapComparator)wrapped).setSchemaManager( schemaManager ); super.setSchemaManager( schemaManager ); } } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java Sat Mar 12 18:55:29 2011 @@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap import java.io.Serializable; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class StringComparator extends LdapComparator implements Serializable +public class StringComparator extends AbstractLdapComparator implements Serializable { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/TelephoneNumberComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class TelephoneNumberComparator extends LdapComparator +public class TelephoneNumberComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UUIDComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class UUIDComparator extends LdapComparator +public class UUIDComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/UniqueMemberComparator.java Sat Mar 12 18:55:29 2011 @@ -24,7 +24,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.SchemaManager; @@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class UniqueMemberComparator extends LdapComparator +public class UniqueMemberComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/WordComparator.java Sat Mar 12 18:55:29 2011 @@ -20,7 +20,7 @@ package org.apache.directory.shared.ldap.model.schema.comparators; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class WordComparator extends LdapComparator +public class WordComparator extends AbstractLdapComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ComparatorRegistry.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; /** @@ -29,8 +29,8 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public interface ComparatorRegistry extends SchemaObjectRegistry>, - Iterable> +public interface ComparatorRegistry extends SchemaObjectRegistry>, + Iterable> { /** * Registers a new LdapComparator with this registry. @@ -39,7 +39,7 @@ public interface ComparatorRegistry exte * @throws LdapException if the LdapComparator is already registered or * the registration operation is not supported */ - void register( LdapComparator comparator ) throws LdapException; + void register( AbstractLdapComparator comparator ) throws LdapException; /** @@ -49,7 +49,7 @@ public interface ComparatorRegistry exte * @param numericOid the numeric identifier * @throws LdapException if the numeric identifier is invalid */ - LdapComparator unregister( String numericOid ) throws LdapException; + AbstractLdapComparator unregister( String numericOid ) throws LdapException; /** Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultComparatorRegistry.java Sat Mar 12 18:55:29 2011 @@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject; import org.apache.directory.shared.ldap.model.schema.SchemaObjectType; import org.slf4j.Logger; @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * * @author Apache Directory Project */ -public class DefaultComparatorRegistry extends DefaultSchemaObjectRegistry> +public class DefaultComparatorRegistry extends DefaultSchemaObjectRegistry> implements ComparatorRegistry { /** static class logger */ @@ -48,7 +48,7 @@ public class DefaultComparatorRegistry e */ public DefaultComparatorRegistry() { - super( SchemaObjectType.COMPARATOR, new OidRegistry>() ); + super( SchemaObjectType.COMPARATOR, new OidRegistry>() ); } @@ -64,7 +64,7 @@ public class DefaultComparatorRegistry e // Loop on all the SchemaObjects stored and remove those associated // with the give schemaName - for ( LdapComparator comparator : this ) + for ( AbstractLdapComparator comparator : this ) { if ( schemaName.equalsIgnoreCase( comparator.getSchemaName() ) ) { @@ -115,7 +115,7 @@ public class DefaultComparatorRegistry e sb.append( ", " ); } - LdapComparator comparator = byName.get( name ); + AbstractLdapComparator comparator = byName.get( name ); String fqcn = comparator.getFqcn(); int lastDotPos = fqcn.lastIndexOf( '.' ); Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableComparatorRegistry.java Sat Mar 12 18:55:29 2011 @@ -26,7 +26,7 @@ import org.apache.directory.shared.i18n. import org.apache.directory.shared.ldap.model.exception.LdapException; import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException; import org.apache.directory.shared.ldap.model.message.ResultCodeEnum; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.SchemaObjectType; @@ -55,7 +55,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public void register( LdapComparator comparator ) throws LdapException + public void register( AbstractLdapComparator comparator ) throws LdapException { throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) ); } @@ -64,7 +64,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public LdapComparator unregister( String numericOid ) throws LdapException + public AbstractLdapComparator unregister( String numericOid ) throws LdapException { throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) ); } @@ -136,7 +136,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public Iterator> iterator() + public Iterator> iterator() { return immutableComparatorRegistry.iterator(); } @@ -145,7 +145,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public LdapComparator lookup( String oid ) throws LdapException + public AbstractLdapComparator lookup( String oid ) throws LdapException { return immutableComparatorRegistry.lookup( oid ); } @@ -172,7 +172,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public LdapComparator get( String oid ) + public AbstractLdapComparator get( String oid ) { return immutableComparatorRegistry.get( oid ); } @@ -190,7 +190,7 @@ public class ImmutableComparatorRegistry /** * {@inheritDoc} */ - public LdapComparator unregister( LdapComparator schemaObject ) throws LdapException + public AbstractLdapComparator unregister( AbstractLdapComparator schemaObject ) throws LdapException { throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04276 ) ); } Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1080975&r1=1080974&r2=1080975&view=diff ============================================================================== --- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original) +++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java Sat Mar 12 18:55:29 2011 @@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.model.schema.AttributeType; import org.apache.directory.shared.ldap.model.schema.DITContentRule; import org.apache.directory.shared.ldap.model.schema.DITStructureRule; -import org.apache.directory.shared.ldap.model.schema.LdapComparator; +import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator; import org.apache.directory.shared.ldap.model.schema.LdapSyntax; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax; import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl; @@ -479,7 +479,7 @@ public class Registries implements Schem } // Check the Comparators - for ( LdapComparator comparator : comparatorRegistry ) + for ( AbstractLdapComparator comparator : comparatorRegistry ) { resolve( comparator, errors ); } @@ -665,7 +665,7 @@ public class Registries implements Schem */ private void buildComparatorReferences( List errors ) { - for ( LdapComparator comparator : comparatorRegistry ) + for ( AbstractLdapComparator comparator : comparatorRegistry ) { buildReference( errors, comparator ); } @@ -958,7 +958,7 @@ public class Registries implements Schem * @param comparator the LdapComparator * @param errors the list of errors to add exceptions to */ - private void resolve( LdapComparator comparator, List errors ) + private void resolve( AbstractLdapComparator comparator, List errors ) { // This is currently doing nothing. try @@ -1038,7 +1038,7 @@ public class Registries implements Schem } // Process the Comparator - LdapComparator comparator = matchingRule.getLdapComparator(); + AbstractLdapComparator comparator = matchingRule.getLdapComparator(); if ( comparator == null ) { @@ -1575,7 +1575,7 @@ public class Registries implements Schem break; case COMPARATOR: - comparatorRegistry.register( ( LdapComparator ) schemaObject ); + comparatorRegistry.register( ( AbstractLdapComparator ) schemaObject ); break; case DIT_CONTENT_RULE: @@ -1793,7 +1793,7 @@ public class Registries implements Schem break; case COMPARATOR: - unregistered = comparatorRegistry.unregister( ( LdapComparator ) schemaObject ); + unregistered = comparatorRegistry.unregister( ( AbstractLdapComparator ) schemaObject ); break; case DIT_CONTENT_RULE: