directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1080957 [1/3] - 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 17:54:27 GMT
Author: akarasulu
Date: Sat Mar 12 17:54:24 2011
New Revision: 1080957

URL: http://svn.apache.org/viewvc?rev=1080957&view=rev
Log:
refactored normalizers: extracted mutable and immutable interfaces

Added:
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractNormalizer.java
      - copied, changed from r1080405, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSyntaxChecker.java
      - copied, changed from r1080939, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableSyntaxCheckerImpl.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableNormalizer.java
Removed:
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableSyntaxCheckerImpl.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/NormalizerSynchronizer.java
    directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.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/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
    directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
    directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.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/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/MutableLdapSyntaxImpl.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.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/NormalizingComparator.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/OidNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/RegexNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/TelephoneNumberNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/UniqueMemberNormalizer.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultNormalizerRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableNormalizerRegistry.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/NormalizerRegistry.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/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AccessPointSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/AttributeTypeUsageSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BinarySyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BitStringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/BooleanSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CountrySyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSidSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/CsnSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITContentRuleDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DITStructureRuleDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DLSubmitPermissionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DNSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSAQualitySyntaxSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DSETypeSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DataQualitySyntaxSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DeliveryMethodSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/DirectoryStringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/GeneralizedTimeSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/Ia5StringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/IntegerSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaByteSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaIntegerSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaLongSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JavaShortSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/JpegSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/LdapSyntaxDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MHSORAddressSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MailPreferenceSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MasterAndShadowAccessPointSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/MatchingRuleUseDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameAndOptionalUIDSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NameFormDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumberSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericOidSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/NumericStringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassDescriptionSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectClassTypeSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ObjectNameSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OctetStringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidLenSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OidSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/OtherMailboxSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PostalAddressSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/PrintableStringSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/ProtocolInformationSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/RegexSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SubtreeSpecificationSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierAndConsumerSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierInformationSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/SupplierOrConsumerSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelephoneNumberSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TeletexTerminalIdentifierSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/TelexNumberSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UtcTimeSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/syntaxCheckers/UuidSyntaxChecker.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
    directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SyntaxCheckerTest.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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -28,8 +28,8 @@ import org.apache.directory.shared.ldap.
 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;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.util.Strings;
@@ -101,7 +101,7 @@ public class TestServerEntryUtils
         AttributeType attributeType = new AttributeType( "1.1.3.1" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.1.1.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.1.2.1" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.1.2.1" )
         {
             private static final long serialVersionUID = -5428997199906309370L;
 
@@ -125,7 +125,7 @@ public class TestServerEntryUtils
             }
 
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 return null;
             }
@@ -165,7 +165,7 @@ public class TestServerEntryUtils
             }
         } );
         
-        Normalizer normalizer = new Normalizer( "1.1.1" )
+        AbstractNormalizer normalizer = new AbstractNormalizer( "1.1.1" )
         {
             private static final long serialVersionUID = -5428997199906309370L;
             public Value<?> normalize( Value<?> value ) throws LdapException
@@ -200,7 +200,7 @@ public class TestServerEntryUtils
         attributeType.addName( "1.1" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.1.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.1.2" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.1.2" )
         {
             private static final long serialVersionUID = -5428997199906309370L;
 
@@ -210,7 +210,7 @@ public class TestServerEntryUtils
             }
 
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 return null;
             }
@@ -245,7 +245,7 @@ public class TestServerEntryUtils
         AttributeType attributeType = new AttributeType( "1.2" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.2.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.2.1" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.2.1" )
         {
             private static final long serialVersionUID = -5428997199906309370L;
             public boolean isValidSyntax( Object value )
@@ -254,7 +254,7 @@ public class TestServerEntryUtils
             }
             
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -266,7 +266,7 @@ public class TestServerEntryUtils
 
         matchingRule.setLdapComparator( new ByteArrayComparator( "1.2.2" ) );
         
-        matchingRule.setNormalizer( new Normalizer( "1.1.1" )
+        matchingRule.setNormalizer( new AbstractNormalizer( "1.1.1" )
         {
             private static final long serialVersionUID = -5428997199906309370L;
             public Value<?> normalize( Value<?> value ) throws LdapException

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Sat Mar 12 17:54:24 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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 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;
@@ -76,7 +76,7 @@ public class NormalizerSynchronizer exte
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oldOid = getOid( entry );
-        Normalizer normalizer = factory.getNormalizer( schemaManager, targetEntry, schemaManager.getRegistries(),
+        AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, targetEntry, schemaManager.getRegistries(),
             schemaName );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -110,7 +110,7 @@ public class NormalizerSynchronizer exte
         // Build the new Normalizer from the given entry
         String schemaName = getSchemaName( dn );
 
-        Normalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(), schemaName );
+        AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(), schemaName );
 
         // At this point, the constructed Normalizer has not been checked against the 
         // existing Registries. It will be checked there, if the schema and the 
@@ -163,7 +163,7 @@ public class NormalizerSynchronizer exte
 
         // Get the Normalizer from the given entry ( it has been grabbed from the server earlier)
         String schemaName = getSchemaName( entry.getDn() );
-        Normalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(), schemaName );
+        AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(), schemaName );
 
         String oid = normalizer.getOid();
 
@@ -221,7 +221,7 @@ public class NormalizerSynchronizer exte
             newDn = newDn.add( newRdn );
             targetEntry.setDn( newDn );
 
-            Normalizer normalizer = factory.getNormalizer( schemaManager, targetEntry, schemaManager.getRegistries(),
+            AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, targetEntry, schemaManager.getRegistries(),
                 schemaName );
             schemaManager.unregisterNormalizer( oldOid );
             schemaManager.add( normalizer );
@@ -245,7 +245,7 @@ public class NormalizerSynchronizer exte
 
         String oid = newRdn.getNormValue().getString();
         checkOidIsUniqueForNormalizer( oid );
-        Normalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(),
+        AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )
@@ -273,7 +273,7 @@ public class NormalizerSynchronizer exte
                 I18n.err( I18n.ERR_368, oid ) );
         }
 
-        Normalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(),
+        AbstractNormalizer normalizer = factory.getNormalizer( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )

Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Sat Mar 12 17:54:24 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.util.Strings;
@@ -76,7 +76,7 @@ public class SyntaxCheckerSynchronizer e
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
-        MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
+        AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
             .getRegistries(), schemaName );
 
         if ( isSchemaEnabled( schemaName ) )
@@ -110,7 +110,7 @@ public class SyntaxCheckerSynchronizer e
         // Build the new SyntaxChecker from the given entry
         String schemaName = getSchemaName( dn );
 
-        MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, entry, schemaManager.getRegistries(),
+        AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, entry, schemaManager.getRegistries(),
             schemaName );
 
         // At this point, the constructed SyntaxChecker has not been checked against the 
@@ -165,11 +165,11 @@ public class SyntaxCheckerSynchronizer e
         }
 
         // Test that the Oid exists
-        MutableSyntaxCheckerImpl syntaxChecker = null;
+        AbstractSyntaxChecker syntaxChecker = null;
 
         try
         {
-            syntaxChecker = ( MutableSyntaxCheckerImpl ) checkSyntaxCheckerOidExists( entry );
+            syntaxChecker = ( AbstractSyntaxChecker ) checkSyntaxCheckerOidExists( entry );
         }
         catch ( LdapSchemaViolationException lsve )
         {
@@ -241,7 +241,7 @@ public class SyntaxCheckerSynchronizer e
 
         if ( isSchemaEnabled( schemaName ) )
         {
-            MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
+            AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
                 .getRegistries(), schemaName );
             schemaManager.unregisterSyntaxChecker( oldOid );
             schemaManager.add( syntaxChecker );
@@ -274,7 +274,7 @@ public class SyntaxCheckerSynchronizer e
         }
 
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
-        MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
+        AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, targetEntry, schemaManager
             .getRegistries(), newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )
@@ -302,7 +302,7 @@ public class SyntaxCheckerSynchronizer e
                 I18n.err( I18n.ERR_393, oid ) );
         }
 
-        MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, entry, schemaManager.getRegistries(),
+        AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, entry, schemaManager.getRegistries(),
             newSchemaName );
 
         if ( isSchemaEnabled( oldSchemaName ) )

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Sat Mar 12 17:54:24 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Before;
@@ -623,7 +623,7 @@ public class MetaSyntaxCheckerHandlerIT 
     }
 
     
-    public static class BogusSyntaxChecker extends MutableSyntaxCheckerImpl
+    public static class BogusSyntaxChecker extends AbstractSyntaxChecker
     {
         private static final long serialVersionUID = 5090483112935298981L;
 
@@ -641,7 +641,7 @@ public class MetaSyntaxCheckerHandlerIT 
 
 
         @Override
-        public MutableSyntaxCheckerImpl copy()
+        public AbstractSyntaxChecker copy()
         {
             // TODO Auto-generated method stub
             return null;

Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Sat Mar 12 17:54:24 2011
@@ -74,7 +74,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.BooleanComparator;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimNormalizer;
 import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -288,7 +288,7 @@ public class SubschemaSubentryIT extends
 
             Entry serverEntry = ServerEntryUtils.toServerEntry( attrs, Dn.ROOT_DSE, getService().getSchemaManager() );
 
-            MutableSyntaxCheckerImpl syntaxChecker = factory.getSyntaxChecker( schemaManager, serverEntry, getService()
+            AbstractSyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, serverEntry, getService()
                 .getSchemaManager().getRegistries(), schemaName );
             assertEquals( oid, syntaxChecker.getOid() );
         }

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -39,12 +39,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.registries.Schema;
 import org.apache.directory.shared.util.DateUtils;
 
@@ -128,7 +128,7 @@ public class AttributesFactory
     }
     
     
-    public Entry getAttributes( MutableSyntaxCheckerImpl syntaxChecker, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( AbstractSyntaxChecker syntaxChecker, Schema schema, SchemaManager schemaManager )
     {
         Entry entry = new DefaultEntry( schemaManager );
 
@@ -156,7 +156,7 @@ public class AttributesFactory
     }
 
     
-    public Entry getAttributes( String oid, Normalizer normalizer, Schema schema, SchemaManager schemaManager )
+    public Entry getAttributes( String oid, AbstractNormalizer normalizer, 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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.ldap.
 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.MutableLdapSyntax;
-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.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.NameForm;
@@ -125,7 +124,7 @@ public class DefaultSchemaService implem
         EntryAttribute attr = new DefaultEntryAttribute( 
             getSchemaManager().getAttributeType( SchemaConstants.NORMALIZERS_AT ) );
 
-        NormalizerRegistry nr = getSchemaManager().getNormalizerRegistry();
+        NormalizerRegistry<Normalizer> nr = getSchemaManager().getNormalizerRegistry();
         
         for ( Normalizer normalizer : nr )
         {

Modified: directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sat Mar 12 17:54:24 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
@@ -58,7 +58,7 @@ public class DummyAttributeTypeRegistry 
 
     public AttributeType lookup( final String id ) throws LdapException
     {
-        Normalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
+        AbstractNormalizer normalizer = new DeepTrimToLowerNormalizer( "1.1.1" );
 
         MatchingRule equality = new MatchingRule( "1.1.1" );
         equality.setNormalizer( normalizer );

Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.xdbm
 
 
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
 
 
@@ -43,7 +43,7 @@ public class BogusSyntax extends Mutable
     }
 
 
-    public MutableSyntaxCheckerImpl getSyntaxChecker()
+    public AbstractSyntaxChecker getSyntaxChecker()
     {
         return new OctetStringSyntaxChecker();
     }

Modified: directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -23,7 +23,7 @@ import java.text.ParseException;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class ACIItemSyntaxChecker extends MutableSyntaxCheckerImpl
+public class ACIItemSyntaxChecker extends AbstractSyntaxChecker
 {
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( ACIItemSyntaxChecker.class );

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -25,8 +25,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 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.Normalizer;
-import org.apache.directory.shared.ldap.model.schema.MutableSyntaxCheckerImpl;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractSyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.util.Strings;
@@ -98,7 +98,7 @@ public class EntryUtils
         AttributeType attributeType = new AttributeType( "1.1.3.1" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.1.1.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.1.2.1" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.1.2.1" )
         {
             private static final long serialVersionUID = 1L;
 
@@ -122,7 +122,7 @@ public class EntryUtils
             }
 
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -145,7 +145,7 @@ public class EntryUtils
             }
         } );
         
-        Normalizer normalizer = new Normalizer( "1.1.1" )
+        AbstractNormalizer normalizer = new AbstractNormalizer( "1.1.1" )
         {
             private static final long serialVersionUID = 1L;
 
@@ -182,7 +182,7 @@ public class EntryUtils
         attributeType.addName( "1.1" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.1.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.1.2" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.1.2" )
         {
             private static final long serialVersionUID = 1L;
 
@@ -192,7 +192,7 @@ public class EntryUtils
             }
 
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -229,7 +229,7 @@ public class EntryUtils
         AttributeType attributeType = new AttributeType( "1.2" );
         MutableLdapSyntaxImpl syntax = new MutableLdapSyntaxImpl( "1.2.1", "", true );
 
-        syntax.setSyntaxChecker( new MutableSyntaxCheckerImpl( "1.2.1" )
+        syntax.setSyntaxChecker( new AbstractSyntaxChecker( "1.2.1" )
         {
             private static final long serialVersionUID = 1L;
 
@@ -239,7 +239,7 @@ public class EntryUtils
             }
 
             @Override
-            public MutableSyntaxCheckerImpl copy()
+            public AbstractSyntaxChecker copy()
             {
                 // TODO Auto-generated method stub
                 return null;
@@ -251,7 +251,7 @@ public class EntryUtils
 
         matchingRule.setLdapComparator( new ByteArrayComparator( "1.2.2" ) );
         
-        matchingRule.setNormalizer( new Normalizer( "1.1.1" )
+        matchingRule.setNormalizer( new AbstractNormalizer( "1.1.1" )
         {
             private static final long serialVersionUID = 1L;
 

Copied: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractNormalizer.java (from r1080405, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractNormalizer.java?p2=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractNormalizer.java&p1=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java&r1=1080405&r2=1080957&rev=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractNormalizer.java Sat Mar 12 17:54:24 2011
@@ -29,17 +29,18 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings({ "PMD.OverrideBothEqualsAndHashcode", "serial" })
-public abstract class Normalizer extends MutableLoadableSchemaObjectImpl
+public abstract class AbstractNormalizer extends MutableLoadableSchemaObjectImpl implements MutableNormalizer
 {
+    private static final long serialVersionUID = 8138180731302564334L;
+
+
     /**
      * The Normalizer base constructor. We use it's MR OID to
      * initialize the SchemaObject instance
      * 
      * @param oid The associated OID. It's the element's MR OID
      */
-    protected Normalizer( String oid )
+    protected AbstractNormalizer( String oid )
     {
         super( SchemaObjectType.NORMALIZER, oid );
     }
@@ -49,28 +50,20 @@ public abstract class Normalizer extends
      * Use this default constructor when the Normalizer must be instantiated
      * before setting the OID.
      */
-    protected Normalizer()
+    protected AbstractNormalizer()
     {
         super( SchemaObjectType.NORMALIZER );
     }
 
 
-    /**
-     * Gets the normalized value.
-     * 
-     * @param value the value to normalize. It must *not* be null !
-     * @return the normalized form for a value
-     * @throws LdapException if an error results during normalization
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.Normalizer#normalize(org.apache.directory.shared.ldap.model.entry.Value)
      */
     public abstract Value<?> normalize( Value<?> value ) throws LdapException;
 
 
-    /**
-     * Gets the normalized value.
-     * 
-     * @param value the value to normalize. It must *not* be null !
-     * @return the normalized form for a value
-     * @throws LdapException if an error results during normalization
+    /* (non-Javadoc)
+     * @see org.apache.directory.shared.ldap.model.schema.Normalizer#normalize(java.lang.String)
      */
     public abstract String normalize( String value ) throws LdapException;
 
@@ -86,6 +79,29 @@ public abstract class Normalizer extends
         // Do nothing (general case).
     }
 
+    
+    public AbstractNormalizer copy()
+    {
+        return new AbstractNormalizer( oid )
+        {
+            private static final long serialVersionUID = 6617568248114910428L;
+
+
+            @Override
+            public String normalize( String value ) throws LdapException
+            {
+                return normalize( value );
+            }
+            
+        
+            @Override
+            public Value<?> normalize( Value<?> value ) throws LdapException
+            {
+                return normalize( value );
+            }
+        };
+    }
+    
 
     /**
      * {@inheritDoc}
@@ -98,7 +114,7 @@ public abstract class Normalizer extends
             return false;
         }
 
-        return o instanceof Normalizer;
+        return o instanceof AbstractNormalizer;
     }
 
 

Copied: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSyntaxChecker.java (from r1080939, directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableSyntaxCheckerImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSyntaxChecker.java?p2=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSyntaxChecker.java&p1=directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableSyntaxCheckerImpl.java&r1=1080939&r2=1080957&rev=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableSyntaxCheckerImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AbstractSyntaxChecker.java Sat Mar 12 17:54:24 2011
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class MutableSyntaxCheckerImpl extends MutableLoadableSchemaObjectImpl implements MutableSyntaxChecker
+public abstract class AbstractSyntaxChecker extends MutableLoadableSchemaObjectImpl implements MutableSyntaxChecker
 {
     private static final long serialVersionUID = -6028809434764891692L;
 
@@ -41,7 +41,7 @@ public abstract class MutableSyntaxCheck
      * The SyntaxChecker base constructor
      * @param oid The associated OID
      */
-    protected MutableSyntaxCheckerImpl( String oid )
+    protected AbstractSyntaxChecker( String oid )
     {
         super( SchemaObjectType.SYNTAX_CHECKER, oid );
     }
@@ -51,15 +51,15 @@ public abstract class MutableSyntaxCheck
      * The SyntaxChecker default constructor where the oid is set after 
      * instantiation.
      */
-    protected MutableSyntaxCheckerImpl()
+    protected AbstractSyntaxChecker()
     {
         super( SchemaObjectType.SYNTAX_CHECKER );
     }
     
     
-    public MutableSyntaxCheckerImpl copy()
+    public AbstractSyntaxChecker copy()
     {
-        return new MutableSyntaxCheckerImpl()
+        return new AbstractSyntaxChecker()
         {
             private static final long serialVersionUID = 1L;
 
@@ -113,7 +113,7 @@ public abstract class MutableSyntaxCheck
             return false;
         }
 
-        return o instanceof MutableSyntaxCheckerImpl;
+        return o instanceof AbstractSyntaxChecker;
     }
 
 

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -633,7 +633,7 @@ public final class DescriptionUtils
      *            the Normalizer to generate the description for
      * @return the NormalizerDescription string
      */
-    public static String getDescription( Normalizer normalizer )
+    public static String getDescription( AbstractNormalizer normalizer )
     {
         return getLoadableDescription( normalizer );
     }
@@ -789,7 +789,7 @@ public final class DescriptionUtils
      *            the SyntaxChecker to generate the description for
      * @return the SyntaxCheckerDescription string
      */
-    public static String getDescription( MutableSyntaxCheckerImpl syntaxChecker )
+    public static String getDescription( AbstractSyntaxChecker syntaxChecker )
     {
         return getLoadableDescription( syntaxChecker );
     }

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -118,7 +118,7 @@ public interface EntityFactory
      * @return the loaded Normalizer
      * @throws LdapException if anything fails during loading
      */
-    Normalizer getNormalizer( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName )
+    AbstractNormalizer getNormalizer( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName )
         throws LdapException;
     
     
@@ -156,7 +156,7 @@ public interface EntityFactory
      * @return the loaded SyntaxChecker
      * @throws LdapException if anything fails during loading
      */
-    MutableSyntaxCheckerImpl getSyntaxChecker( SchemaManager schemaManager, Entry entry, Registries targetRegistries, String schemaName ) throws LdapException;
+    AbstractSyntaxChecker getSyntaxChecker( 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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -85,8 +85,6 @@ import org.slf4j.LoggerFactory;
  * @see DescriptionUtils#getDescription(MatchingRule)
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-// super.hashCode is final
-@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
 public class MatchingRule extends AbstractMutableSchemaObject
 {
     private static final long serialVersionUID = 1L;
@@ -98,7 +96,7 @@ public class MatchingRule extends Abstra
     protected LdapComparator<? super Object> ldapComparator;
 
     /** The associated Normalizer */
-    protected Normalizer normalizer;
+    protected MutableNormalizer normalizer;
 
     /** The associated LdapSyntax */
     protected MutableLdapSyntax ldapSyntax;
@@ -369,7 +367,7 @@ public class MatchingRule extends Abstra
      * @return the associated normalizer
      * @throws NamingException if there is a failure resolving the object
      */
-    public Normalizer getNormalizer()
+    public MutableNormalizer getNormalizer()
     {
         return normalizer;
     }
@@ -380,7 +378,7 @@ public class MatchingRule extends Abstra
      *
      * @param normalizer The Normalizer
      */
-    public void setNormalizer( Normalizer normalizer )
+    public void setNormalizer( AbstractNormalizer normalizer )
     {
         if ( locked )
         {
@@ -399,7 +397,7 @@ public class MatchingRule extends Abstra
      *
      * @param normalizer The Normalizer
      */
-    public void updateNormalizer( Normalizer normalizer )
+    public void updateNormalizer( AbstractNormalizer normalizer )
     {
         if ( locked )
         {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableLdapSyntaxImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableLdapSyntaxImpl.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableLdapSyntaxImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableLdapSyntaxImpl.java Sat Mar 12 17:54:24 2011
@@ -176,7 +176,7 @@ public class MutableLdapSyntaxImpl exten
      *
      * @param newSyntaxChecker The associated SyntaxChecker
      */
-    public void updateSyntaxChecker( MutableSyntaxCheckerImpl newSyntaxChecker )
+    public void updateSyntaxChecker( AbstractSyntaxChecker newSyntaxChecker )
     {
         if ( locked )
         {

Added: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableNormalizer.java?rev=1080957&view=auto
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableNormalizer.java (added)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/MutableNormalizer.java Sat Mar 12 17:54:24 2011
@@ -0,0 +1,33 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.shared.ldap.model.schema;
+
+
+/**
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public interface MutableNormalizer extends MutableLoadableSchemaObject, Normalizer
+{
+    /**
+     * {@inheritDoc}
+     */
+    MutableNormalizer copy();
+}
\ No newline at end of file

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/Normalizer.java Sat Mar 12 17:54:24 2011
@@ -24,45 +24,16 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 
 
-/**
- * Converts attribute values to a canonical form.
- * 
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-// super.hashCode is final
-@SuppressWarnings({ "PMD.OverrideBothEqualsAndHashcode", "serial" })
-public abstract class Normalizer extends MutableLoadableSchemaObjectImpl
+public interface Normalizer extends LoadableSchemaObject
 {
     /**
-     * The Normalizer base constructor. We use it's MR OID to
-     * initialize the SchemaObject instance
-     * 
-     * @param oid The associated OID. It's the element's MR OID
-     */
-    protected Normalizer( String oid )
-    {
-        super( SchemaObjectType.NORMALIZER, oid );
-    }
-
-
-    /**
-     * Use this default constructor when the Normalizer must be instantiated
-     * before setting the OID.
-     */
-    protected Normalizer()
-    {
-        super( SchemaObjectType.NORMALIZER );
-    }
-
-
-    /**
      * Gets the normalized value.
      * 
      * @param value the value to normalize. It must *not* be null !
      * @return the normalized form for a value
      * @throws LdapException if an error results during normalization
      */
-    public abstract Value<?> normalize( Value<?> value ) throws LdapException;
+    Value<?> normalize( Value<?> value ) throws LdapException;
 
 
     /**
@@ -72,42 +43,11 @@ public abstract class Normalizer extends
      * @return the normalized form for a value
      * @throws LdapException if an error results during normalization
      */
-    public abstract String normalize( String value ) throws LdapException;
-
-
-    /**
-     * Store the SchemaManager in this instance. It may be necessary for some
-     * normalizer which needs to have access to the oidNormalizer Map.
-     *
-     * @param schemaManager the schemaManager to store
-     */
-    public void setSchemaManager( SchemaManager schemaManager )
-    {
-        // Do nothing (general case).
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals( Object o )
-    {
-        if ( !super.equals( o ) )
-        {
-            return false;
-        }
-
-        return o instanceof Normalizer;
-    }
-
-
+    String normalize( String value ) throws LdapException;
+    
+    
     /**
      * {@inheritDoc}
      */
-    @Override
-    public String toString()
-    {
-        return objectType + " " + DescriptionUtils.getDescription( this );
-    }
-}
+    Normalizer copy();
+}
\ No newline at end of file

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -480,7 +480,7 @@ public interface SchemaManager
      * @return The found Normalizer 
      * @throws LdapException if the OID is not found in the Normalizer registry
      */
-    Normalizer lookupNormalizerRegistry( String oid ) throws LdapException;
+    MutableNormalizer lookupNormalizerRegistry( String oid ) throws LdapException;
 
 
     /**
@@ -566,7 +566,7 @@ public interface SchemaManager
      * 
      * @return A reference to the Normalizer registry.
      */
-    NormalizerRegistry getNormalizerRegistry();
+    NormalizerRegistry<Normalizer> getNormalizerRegistry();
 
 
     /**

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=1080957&r1=1080956&r2=1080957&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 17:54:24 2011
@@ -22,7 +22,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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
     private static final Logger LOG = LoggerFactory.getLogger( NormalizingComparator.class );
 
     /** the Normalizer to normalize values with before comparing */
-    private Normalizer normalizer;
+    private AbstractNormalizer normalizer;
 
     /** the underlying comparator to use for comparisons */
     private LdapComparator<String> 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, Normalizer normalizer, LdapComparator<String> comparator )
+    public NormalizingComparator( String oid, AbstractNormalizer normalizer, LdapComparator<String> comparator )
     {
         super( oid );
         this.normalizer = normalizer;

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/BooleanNormalizer.java Sat Mar 12 17:54:24 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 
 
 /**
@@ -34,7 +34,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class BooleanNormalizer extends Normalizer
+public class BooleanNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of BooleanNormalizer.

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/CachingNormalizer.java Sat Mar 12 17:54:24 2011
@@ -22,7 +22,7 @@ package 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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.registries.Registries;
 
@@ -33,13 +33,13 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class CachingNormalizer extends Normalizer
+public class CachingNormalizer extends AbstractNormalizer
 {
     /** Cache maximum size default */
     public static final int CACHE_MAX = 250;
 
     /** The underlying decorated Normalizer */
-    protected final Normalizer normalizer;
+    protected final AbstractNormalizer normalizer;
 
 
     // ------------------------------------------------------------------------
@@ -52,7 +52,7 @@ public class CachingNormalizer extends N
      * 
      * @param normalizer the underlying Normalizer being decorated
      */
-    public CachingNormalizer( Normalizer normalizer )
+    public CachingNormalizer( AbstractNormalizer normalizer )
     {
         this( normalizer, CACHE_MAX );
     }
@@ -65,7 +65,7 @@ public class CachingNormalizer extends N
      * @param normalizer the underlying Normalizer being decorated
      * @param cacheSz the maximum size of the name cache
      */
-    public CachingNormalizer( Normalizer normalizer, int cacheSz )
+    public CachingNormalizer( AbstractNormalizer normalizer, int cacheSz )
     {
         super( normalizer.getOid() );
         this.normalizer = normalizer;

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimNormalizer.java Sat Mar 12 17:54:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
 
 
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class DeepTrimNormalizer extends Normalizer
+public class DeepTrimNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of DeepTrimNormalizer with OID known.

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DeepTrimToLowerNormalizer.java Sat Mar 12 17:54:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
 
 
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class DeepTrimToLowerNormalizer extends Normalizer
+public class DeepTrimToLowerNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of DeepTrimToLowerNormalizer.

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DefaultStringNormalizer.java Sat Mar 12 17:54:24 2011
@@ -23,7 +23,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -36,7 +36,7 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class DefaultStringNormalizer extends Normalizer
+public class DefaultStringNormalizer extends AbstractNormalizer
 {
     /** A default String normalizer */
     private static final DefaultStringNormalizer NORMALIZER = new DefaultStringNormalizer();

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/DnNormalizer.java Sat Mar 12 17:54:24 2011
@@ -25,7 +25,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.name.Dn;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 
 
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class DnNormalizer extends Normalizer
+public class DnNormalizer extends AbstractNormalizer
 {
     /** A reference to the schema manager used to normalize the Dn */
     private SchemaManager schemaManager;

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/GeneralizedTimeNormalizer.java Sat Mar 12 17:54:24 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
 import org.apache.directory.shared.util.GeneralizedTime;
 import org.apache.directory.shared.util.GeneralizedTime.Format;
@@ -51,7 +51,7 @@ import org.apache.directory.shared.util.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class GeneralizedTimeNormalizer extends Normalizer
+public class GeneralizedTimeNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of GeneralizedTimeNormalizer.

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NameOrNumericIdNormalizer.java Sat Mar 12 17:54:24 2011
@@ -26,7 +26,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.exception.LdapOtherException;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.NumericOidSyntaxChecker;
 
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class NameOrNumericIdNormalizer extends Normalizer
+public class NameOrNumericIdNormalizer extends AbstractNormalizer
 {
     private NumericOidSyntaxChecker checker = new NumericOidSyntaxChecker();
 

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NoOpNormalizer.java Sat Mar 12 17:54:24 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 
 
 /**
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class NoOpNormalizer extends Normalizer
+public class NoOpNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of NoOpNormalizer.
@@ -57,7 +57,7 @@ public class NoOpNormalizer extends Norm
      * 
      * @param value any value
      * @return the value argument returned as-is
-     * @see org.apache.directory.shared.ldap.model.schema.Normalizer#normalize(Value)
+     * @see org.apache.directory.shared.ldap.model.schema.AbstractNormalizer#normalize(Value)
      */
     public Value<?> normalize( Value<?> value )
     {
@@ -70,7 +70,7 @@ public class NoOpNormalizer extends Norm
      * 
      * @param value any value
      * @return the value argument returned as-is
-     * @see org.apache.directory.shared.ldap.model.schema.Normalizer#normalize(String)
+     * @see org.apache.directory.shared.ldap.model.schema.AbstractNormalizer#normalize(String)
      */
     public String normalize( String value )
     {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/NumericNormalizer.java Sat Mar 12 17:54:24 2011
@@ -28,7 +28,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.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.PrepareString;
 
 
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class NumericNormalizer extends Normalizer
+public class NumericNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of NumericNormalizer.

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java?rev=1080957&r1=1080956&r2=1080957&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ObjectIdentifierNormalizer.java Sat Mar 12 17:54:24 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 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.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @SuppressWarnings("serial")
-public class ObjectIdentifierNormalizer extends Normalizer
+public class ObjectIdentifierNormalizer extends AbstractNormalizer
 {
     /**
      * Creates a new instance of ObjectIdentifierNormalizer.



Mime
View raw message