svn commit: r808955 - in /directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema: ConcreteNameComponentNormalizer.java NameAndOptionalUIDNormalizer.java registries/

[ak...@apache.org]

Author: akarasulu
Date: Fri Aug 28 17:01:06 2009
New Revision: 808955

URL: http://svn.apache.org/viewvc?rev=808955&view=rev
Log:
fixing some breakage in normalizers and comparators that will be moved shortly before deleting this module

Removed:
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/registries/
Modified:
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java
    directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java?rev=808955&r1=808954&r2=808955&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/ConcreteNameComponentNormalizer.java Fri Aug 28 17:01:06 2009
@@ -20,7 +20,7 @@
 package org.apache.directory.server.schema;
 
 
-import java.io.UnsupportedEncodingException;
+import java.io.UnsupportedEncodingException; 
 
 import javax.naming.NamingException;
 
@@ -31,7 +31,6 @@
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,9 +52,6 @@
     /** the at registry used to dynamically resolve Normalizers */
     private final AttributeTypeRegistry attributeRegistry;
     
-    /** the oid registry used to dynamically resolve aliases to OIDs */
-    private final OidRegistry oidRegistry;
-
 
     /**
      * Creates a DN Name component Normalizer which uses the bootstrap
@@ -64,10 +60,9 @@
      *
      * @param registry the at registry used to dynamically resolve Normalizers
      */
-    public ConcreteNameComponentNormalizer( AttributeTypeRegistry registry, OidRegistry oidRegistry )
+    public ConcreteNameComponentNormalizer( AttributeTypeRegistry registry )
     {
         this.attributeRegistry = registry;
-        this.oidRegistry = oidRegistry;
     }
 
     
@@ -218,12 +213,12 @@
      */
     public boolean isDefined( String id )
     {
-        return attributeRegistry.hasAttributeType( id );
+        return attributeRegistry.contains( id );
     }
 
 
     public String normalizeName( String attributeName ) throws NamingException
     {
-        return oidRegistry.getOid( attributeName );
+        return attributeRegistry.getOid( attributeName );
     }
 }

Modified: directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java?rev=808955&r1=808954&r2=808955&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/schema-registries/src/main/java/org/apache/directory/server/schema/NameAndOptionalUIDNormalizer.java Fri Aug 28 17:01:06 2009
@@ -20,7 +20,6 @@
 package org.apache.directory.server.schema;
 
 
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -40,6 +39,8 @@
  */
 public class NameAndOptionalUIDNormalizer extends Normalizer
 {
+    private static final String OID = "2.5.13.23";
+
     // The serial UID
     private static final long serialVersionUID = 1L;
 
@@ -49,10 +50,12 @@
     
     public NameAndOptionalUIDNormalizer()
     {
+        super( OID );
     }
     
     public NameAndOptionalUIDNormalizer( AttributeTypeRegistry attrRegistry )
     {
+        super( OID );
         this.attrRegistry = attrRegistry;
     }