directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r806816 - in /directory/shared/branches/shared-schema/ldap/src/main: antlr/ java/org/apache/directory/shared/ldap/schema/ java/org/apache/directory/shared/ldap/schema/normalizers/ java/org/apache/directory/shared/ldap/schema/parsers/
Date Sat, 22 Aug 2009 09:02:46 GMT
Author: elecharny
Date: Sat Aug 22 09:02:45 2009
New Revision: 806816

URL: http://svn.apache.org/viewvc?rev=806816&view=rev
Log:
o Modified the normalizer
o Fixed the parsers

Modified:
    directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/antlr/schema.g Sat Aug 22 09:02:45
2009
@@ -842,13 +842,13 @@
      * fqcnComponent = ???
      * </pre>
     */
-normalizerDescription returns [NormalizerDescription nd = new NormalizerDescription()]
+normalizerDescription returns [NormalizerDescription nd]
     {
         matchedProduction( "normalizerDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( oid:STARTNUMERICOID { nd.setNumericOid(numericoid(oid.getText())); } )
+    ( oid:STARTNUMERICOID { nd = new NormalizerDescription(numericoid(oid.getText())); }
)
     (
         ( desc:DESC { et.track("DESC", desc); nd.setDescription(qdstring(desc.getText()));
} )
         |
@@ -898,13 +898,13 @@
      * fqcnComponent = ???
      * </pre>
     */
-syntaxCheckerDescription returns [SyntaxCheckerDescription scd = new SyntaxCheckerDescription()]
+syntaxCheckerDescription returns [SyntaxCheckerDescription scd]
     {
         matchedProduction( "syntaxCheckerDescription()" );
         ElementTracker et = new ElementTracker();
     }
     :
-    ( oid:STARTNUMERICOID { scd.setNumericOid(numericoid(oid.getText())); } )
+    ( oid:STARTNUMERICOID { scd = new SyntaxCheckerDescription(numericoid(oid.getText()));
} )
     (
         ( desc:DESC { et.track("DESC", desc); scd.setDescription(qdstring(desc.getText()));
} )
         |

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/Normalizer.java
Sat Aug 22 09:02:45 2009
@@ -31,16 +31,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Normalizer extends SchemaObject
+public abstract class Normalizer extends LoadableSchemaObject
 {
+    /** The serialversionUID */
+    private static final long serialVersionUID = 1L;
+
     /**
+     * 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 );
+    }
+
+
+	/**
      * Gets the normalized value.
      * 
      * @param value the value to normalize. It must *not* be null !
      * @return the normalized form for a value
      * @throws NamingException if an error results during normalization
      */
-    Value<?> normalize( Value<?> value ) throws NamingException;
+    public abstract Value<?> normalize( Value<?> value ) throws NamingException;
 
     /**
      * Gets the normalized value.
@@ -49,5 +64,5 @@
      * @return the normalized form for a value
      * @throws NamingException if an error results during normalization
      */
-    String normalize( String value ) throws NamingException;
+    public abstract String normalize( String value ) throws NamingException;
 }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/BooleanNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -22,6 +22,7 @@
 
 import javax.naming.NamingException;
 
+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.schema.Normalizer;
@@ -34,10 +35,18 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class BooleanNormalizer implements Normalizer
+public class BooleanNormalizer extends Normalizer
 {
-    // The serial UID
-    private static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of BooleanNormalizer.
+     */
+    protected BooleanNormalizer()
+    {
+        super( SchemaConstants.BOOLEAN_MATCH_MR_OID );
+    }
 
 
     /**

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/CachingNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -33,9 +33,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class CachingNormalizer implements Normalizer
+public class CachingNormalizer extends Normalizer
 {
-    private static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
 
     /** Cache maximum size default */
     public static final int CACHE_MAX = 250;
@@ -55,9 +56,10 @@
      * Creates a CachingNormalizer that decorates another normalizer using a
      * default cache size.
      * 
+     * @param oid The MR OID to use with this Normalizer
      * @param normalizer the underlying Normalizer being decorated
      */
-    public CachingNormalizer( Normalizer normalizer )
+    public CachingNormalizer( String oid, Normalizer normalizer )
     {
         this( normalizer, CACHE_MAX );
     }
@@ -72,6 +74,7 @@
      */
     public CachingNormalizer( Normalizer normalizer, int cacheSz )
     {
+        super( normalizer.getOid() );
         this.normalizer = normalizer;
         cache = new SynchronizedLRUMap( cacheSz );
     }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -28,8 +28,6 @@
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.PrepareString;
-import org.apache.directory.shared.ldap.schema.PrepareString.StringType;
-import org.apache.directory.shared.ldap.util.StringTools;
 
 
 /**
@@ -40,10 +38,22 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DeepTrimNormalizer implements Normalizer
+public class DeepTrimNormalizer extends Normalizer
 {
-    // The serial UID
-   private static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of DeepTrimNormalizer.
+     * 
+     * @param oid The MR OID to use with this Normalizer
+     */
+    protected DeepTrimNormalizer( String oid )
+    {
+        super( oid );
+    }
+
+
 
    /**
     * {@inheritDoc}

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/DeepTrimToLowerNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -39,10 +39,21 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DeepTrimToLowerNormalizer implements Normalizer
+public class DeepTrimToLowerNormalizer extends Normalizer
 {
-    // The serial UID
-    private static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of DeepTrimToLowerNormalizer.
+     * 
+     * @param oid The MR OID to use with this Normalizer
+     */
+    protected DeepTrimToLowerNormalizer( String oid )
+    {
+        super( oid );
+    }
+
 
     /**
      * {@inheritDoc}

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/GeneralizedTimeNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -24,12 +24,11 @@
 
 import javax.naming.NamingException;
 
+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.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.PrepareString;
-import org.apache.directory.shared.ldap.schema.PrepareString.StringType;
-import org.apache.directory.shared.ldap.util.StringTools;
 
 
 /**
@@ -43,10 +42,19 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 491034 $
  */
-public class GeneralizedTimeNormalizer implements Normalizer
+public class GeneralizedTimeNormalizer extends Normalizer
 {
-    // The serial UID
-   static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of GeneralizedTimeNormalizer.
+     */
+    protected GeneralizedTimeNormalizer()
+    {
+        super( SchemaConstants.GENERALIZED_TIME_MATCH_MR_OID );
+    }
+
 
    /**
     * {@inheritDoc}

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NoOpNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -20,8 +20,6 @@
 package org.apache.directory.shared.ldap.schema.normalizers;
 
 
-import java.io.Serializable;
-
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 
@@ -32,15 +30,23 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class NoOpNormalizer implements Normalizer, Serializable
+public class NoOpNormalizer extends Normalizer
 {
-    // The serial UID
-    static final long serialVersionUID = -7817763636668562489L;
-    
-    /** A static instance of this normalizer */
-    public static final NoOpNormalizer INSTANCE = new NoOpNormalizer();
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
 
     /**
+     * Creates a new instance of NoOpNormalizer.
+     * 
+     * @param oid The MR OID to use with this Normalizer
+     */
+    protected NoOpNormalizer( String oid )
+    {
+        super( oid );
+    }
+
+    
+    /**
      * Returns the value argument as-is without alterations all the time.
      * 
      * @param value any value

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/NumericNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -24,6 +24,7 @@
 
 import javax.naming.NamingException;
 
+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.schema.Normalizer;
@@ -35,10 +36,18 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NumericNormalizer implements Normalizer
+public class NumericNormalizer extends Normalizer
 {
-    // The serial UID
-   static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of NumericNormalizer.
+     */
+    protected NumericNormalizer()
+    {
+        super( SchemaConstants.NUMERIC_STRING_MATCH_MR_OID );
+    }
 
    
    /**

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/ObjectIdentifierNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -22,6 +22,7 @@
 
 import javax.naming.NamingException;
 
+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.schema.Normalizer;
@@ -33,10 +34,19 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class ObjectIdentifierNormalizer implements Normalizer
+public class ObjectIdentifierNormalizer extends Normalizer
 {
-    // The serial UID
-    private static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of ObjectIdentifierNormalizer.
+     */
+    protected ObjectIdentifierNormalizer()
+    {
+        super( SchemaConstants.OBJECT_IDENTIFIER_MATCH_MR_OID );
+    }
+
 
     /**
      * {@inheritDoc}

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/RegexNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -34,11 +34,11 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class RegexNormalizer implements Normalizer
+public class RegexNormalizer extends Normalizer
 {
-    // The serial UID
-    private static final long serialVersionUID = 1L;
-    
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
     /** the perl 5 regex engine */
     private final Pattern[] regexes;
 
@@ -49,11 +49,12 @@
     /**
      * Creates a Perl5 regular expression based normalizer.
      * 
-     * @param regexes
-     *            the set of regular expressions used to transform values
+     * @param oid The MR OID to use for this Normalizer
+     * @param regexes the set of regular expressions used to transform values
      */
-    public RegexNormalizer( Pattern[] regexes )
+    public RegexNormalizer( String oid, Pattern[] regexes )
     {
+        super( oid );
         if ( regexes != null )
         {
             this.regexes = new Pattern[ regexes.length ];

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/normalizers/TelephoneNumberNormalizer.java
Sat Aug 22 09:02:45 2009
@@ -24,6 +24,7 @@
 
 import javax.naming.NamingException;
 
+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.schema.Normalizer;
@@ -35,10 +36,20 @@
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class TelephoneNumberNormalizer implements Normalizer
+public class TelephoneNumberNormalizer extends Normalizer
 {
-    // The serial UID
-   static final long serialVersionUID = 1L;
+    /** The serial UID */
+    public static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new instance of TelephoneNumberNormalizer.
+     */
+    protected TelephoneNumberNormalizer()
+    {
+        super( SchemaConstants.TELEPHONE_NUMBER_MATCH_MR_OID );
+    }
+
+
 
    /**
     * {@inheritDoc}

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/NormalizerDescription.java
Sat Aug 22 09:02:45 2009
@@ -20,6 +20,9 @@
 
 package org.apache.directory.shared.ldap.schema.parsers;
 
+import org.apache.directory.shared.ldap.schema.LoadableSchemaObject;
+import org.apache.directory.shared.ldap.schema.SchemaObjectType;
+
 
 /**
  * An ApacheDS specific schema description for a Normalizer.
@@ -27,7 +30,26 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class NormalizerDescription extends AbstractAdsSchemaDescription
+public class NormalizerDescription extends LoadableSchemaObject
 {
+	/** SerialVersionUID */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Default constructor for a NormalizerDecription
+	 * @param oid The SyntaxChecker OID
+	 */
+	public NormalizerDescription( String oid ) 
+	{
+		super( SchemaObjectType.NORMALIZER, oid );
+	}
 
+    
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        return "SyntaxChecker description : " + getDescription();
+    }
 }

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java?rev=806816&r1=806815&r2=806816&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/parsers/SyntaxCheckerDescription.java
Sat Aug 22 09:02:45 2009
@@ -39,7 +39,17 @@
 	 * Default constructor for a SyntaxCheckerDecription
 	 * @param oid The SyntaxChecker OID
 	 */
-	public SyntaxCheckerDescription( String oid ) {
-		super( SchemaObjectType.SYNTAX_CHECKER, oid);
+	public SyntaxCheckerDescription( String oid ) 
+	{
+		super( SchemaObjectType.SYNTAX_CHECKER, oid );
 	}
+
+    
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        return "SyntaxChecker description : " + getDescription();
+    }
 }



Mime
View raw message