directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [20/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifUtils.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.entry.AttributeUtils;
 import org.apache.directory.shared.util.Base64;
@@ -181,29 +181,29 @@ public final class LdifUtils
 
 
     /**
-     * Convert an Attributes as LDIF. The DN is written.
+     * Convert an Attributes as LDIF. The Dn is written.
      * 
      * @param attrs the Attributes to convert
-     * @param dn The DN for this entry
+     * @param dn The Dn for this entry
      * @param length The ldif line length
      * @return the corresponding LDIF code as a String
      * @throws LdapException If a naming exception is encountered.
      */
-    public static String convertToLdif( Attributes attrs, DN dn, int length ) throws LdapException
+    public static String convertToLdif( Attributes attrs, Dn dn, int length ) throws LdapException
     {
         return convertEntryToLdif( AttributeUtils.toClientEntry( attrs, dn ), length );
     }
 
 
     /**
-     * Convert an Attributes as LDIF. The DN is written.
+     * Convert an Attributes as LDIF. The Dn is written.
      * 
      * @param attrs the Attributes to convert
-     * @param dn The DN for this entry
+     * @param dn The Dn for this entry
      * @return the corresponding LDIF code as a String
      * @throws LdapException If a naming exception is encountered.
      */
-    public static String convertToLdif( Attributes attrs, DN dn ) throws LdapException
+    public static String convertToLdif( Attributes attrs, Dn dn ) throws LdapException
     {
         return convertEntryToLdif( AttributeUtils.toClientEntry( attrs, dn ), DEFAULT_LINE_LENGTH );
     }
@@ -244,7 +244,7 @@ public final class LdifUtils
 
 
     /**
-     * Convert all the Entry's attributes to LDIF. The DN is not written
+     * Convert all the Entry's attributes to LDIF. The Dn is not written
      * 
      * @param entry the Entry to convert
      * @return the corresponding LDIF code as a String
@@ -285,7 +285,7 @@ public final class LdifUtils
 
         if ( entry.getDn() != null )
         {
-            // First, dump the DN
+            // First, dump the Dn
             if ( isLDIFSafe( entry.getDn().getName() ) )
             {
                 sb.append( stripLineToNChars( "dn: " + entry.getDn().getName(), length ) );
@@ -309,7 +309,7 @@ public final class LdifUtils
 
 
     /**
-     * Convert the Entry's attributes to LDIF. The DN is not written.
+     * Convert the Entry's attributes to LDIF. The Dn is not written.
      * 
      * @param entry the Entry to convert
      * @param length the expected line length
@@ -355,7 +355,7 @@ public final class LdifUtils
     {
         StringBuilder sb = new StringBuilder();
 
-        // First, dump the DN
+        // First, dump the Dn
         if ( isLDIFSafe( entry.getDn().getName() ) )
         {
             sb.append( stripLineToNChars( "dn: " + entry.getDn(), length ) );
@@ -435,7 +435,7 @@ public final class LdifUtils
                     throw new LdapException( I18n.err( I18n.ERR_12083 ) );
                 }
 
-                // Stores the new RDN
+                // Stores the new Rdn
                 EntryAttribute newRdn = new DefaultEntryAttribute( "newrdn", entry.getNewRdn() );
                 sb.append( convertToLdif( newRdn, length ) );
 
@@ -652,7 +652,7 @@ public final class LdifUtils
 
     /**
      * Build a new Attributes instance from a LDIF list of lines. The values can be
-     * either a complete AVA, or a couple of AttributeType ID and a value (a String or
+     * either a complete Ava, or a couple of AttributeType ID and a value (a String or
      * a byte[]). The following sample shows the three cases :
      *
      * <pre>
@@ -732,24 +732,24 @@ public final class LdifUtils
 
     /**
      * Build a new Entry instance from a LDIF list of lines. The values can be
-     * either a complete AVA, or a couple of AttributeType ID and a value (a String or
+     * either a complete Ava, or a couple of AttributeType ID and a value (a String or
      * a byte[]). The following sample shows the three cases :
      *
      * <pre>
      * Entry entry = LdifUtils.createEntry(
-     *     new DN( "cn=test" ),
+     *     new Dn( "cn=test" ),
      *     "objectclass: top",
      *     "cn", "My name",
      *     "jpegPhoto", new byte[]{0x01, 0x02} );
      * </pre>
      *
-     * @param dn The Entry's DN
+     * @param dn The Entry's Dn
      * @param avas The AttributeType and Values, using a ldif format, or a couple of
      * Attribute ID/Value
      * @return An Entry instance
      * @throws LdapException If the data are invalid
      */
-    public static Entry createEntry( DN dn, Object... avas ) throws LdapException
+    public static Entry createEntry( Dn dn, Object... avas ) throws LdapException
     {
         return createEntry( null, dn, avas );
     }
@@ -757,18 +757,18 @@ public final class LdifUtils
 
     /**
      * Build a new Entry instance from a LDIF list of lines. The values can be
-     * either a complete AVA, or a couple of AttributeType ID and a value (a String or
+     * either a complete Ava, or a couple of AttributeType ID and a value (a String or
      * a byte[]). The following sample shows the three cases :
      *
      * <pre>
      * Entry entry = LdifUtils.createEntry(
-     *     new DN( "cn=test" ),
+     *     new Dn( "cn=test" ),
      *     "objectclass: top",
      *     "cn", "My name",
      *     "jpegPhoto", new byte[]{0x01, 0x02} );
      * </pre>
      *
-     * @param dn The entry's DN as a String
+     * @param dn The entry's Dn as a String
      * @param avas The AttributeType and Values, using a ldif format, or a couple of
      * Attribute ID/Value
      * @return An Entry instance
@@ -776,25 +776,25 @@ public final class LdifUtils
      */
     public static Entry createEntry( String dn, Object... avas ) throws LdapException
     {
-        return createEntry( null, new DN( dn ), avas );
+        return createEntry( null, new Dn( dn ), avas );
     }
 
 
     /**
      * Build a new Entry instance from a LDIF list of lines. The values can be
-     * either a complete AVA, or a couple of AttributeType ID and a value (a String or
+     * either a complete Ava, or a couple of AttributeType ID and a value (a String or
      * a byte[]). The following sample shows the three cases :
      *
      * <pre>
      * Entry entry = LdifUtils.createEntry(
-     *     new DN( "cn=test" ),
+     *     new Dn( "cn=test" ),
      *     "objectclass: top",
      *     "cn", "My name",
      *     "jpegPhoto", new byte[]{0x01, 0x02} );
      * </pre>
      *
      * @param schemaManager The SchemaManager instance
-     * @param dn The entry's DN
+     * @param dn The entry's Dn
      * @param avas The AttributeType and Values, using a ldif format, or a couple of
      * Attribute ID/Value
      * @return An Entry instance
@@ -802,31 +802,31 @@ public final class LdifUtils
      */
     public static Entry createEntry( SchemaManager schemaManager, String dn, Object... avas ) throws LdapException
     {
-        return createEntry( schemaManager, new DN( dn ), avas );
+        return createEntry( schemaManager, new Dn( dn ), avas );
     }
 
 
     /**
      * Build a new Entry instance from a LDIF list of lines. The values can be
-     * either a complete AVA, or a couple of AttributeType ID and a value (a String or
+     * either a complete Ava, or a couple of AttributeType ID and a value (a String or
      * a byte[]). The following sample shows the three cases :
      *
      * <pre>
      * Entry entry = LdifUtils.createEntry(
-     *     new DN( "cn=test" ),
+     *     new Dn( "cn=test" ),
      *     "objectclass: top",
      *     "cn", "My name",
      *     "jpegPhoto", new byte[]{0x01, 0x02} );
      * </pre>
      *
      * @param schemaManager The SchemaManager instance
-     * @param dn The entry's DN
+     * @param dn The entry's Dn
      * @param avas The AttributeType and Values, using a ldif format, or a couple of
      * Attribute ID/Value
      * @return An Entry instance
      * @throws LdapException If the data are invalid
      */
-    public static Entry createEntry( SchemaManager schemaManager, DN dn, Object... avas ) throws LdapException
+    public static Entry createEntry( SchemaManager schemaManager, Dn dn, Object... avas ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
         int pos = 0;

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ package org.apache.directory.shared.ldap
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -46,7 +46,7 @@ public interface AddRequest extends Sing
      * 
      * @return the Dn of the added entry.
      */
-    DN getEntryDn();
+    Dn getEntryDn();
 
 
     /**
@@ -54,7 +54,7 @@ public interface AddRequest extends Sing
      * 
      * @param entry the Dn of the added entry.
      */
-    void setEntryDn( DN entry );
+    void setEntryDn( Dn entry );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -96,7 +96,7 @@ public class AddRequestImpl extends Abst
      * 
      * @return the Dn of the added entry.
      */
-    public DN getEntryDn()
+    public Dn getEntryDn()
     {
         return entry.getDn();
     }
@@ -107,7 +107,7 @@ public class AddRequestImpl extends Abst
      * 
      * @param dn the Dn of the added entry.
      */
-    public void setEntryDn( DN dn )
+    public void setEntryDn( Dn dn )
     {
         entry.setDn( dn );
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -99,11 +99,11 @@ public interface BindRequest extends Sin
      * request. This field may take on a null value (a zero length string) for
      * the purposes of anonymous binds, when authentication has been performed
      * at a lower layer, or when using SASL credentials with a mechanism that
-     * includes the DN in the credentials.
+     * includes the Dn in the credentials.
      * 
-     * @return the DN of the authenticating user.
+     * @return the Dn of the authenticating user.
      */
-    DN getName();
+    Dn getName();
 
 
     /**
@@ -111,13 +111,13 @@ public interface BindRequest extends Sin
      * request. This field may take on a null value (or a zero length string)
      * for the purposes of anonymous binds, when authentication has been
      * performed at a lower layer, or when using SASL credentials with a
-     * mechanism that includes the DN in the credentials.
+     * mechanism that includes the Dn in the credentials.
      * 
      * @param name
-     *            the DN of the authenticating user - leave null for annonymous
+     *            the Dn of the authenticating user - leave null for annonymous
      *            user.
      */
-    void setName( DN name );
+    void setName( Dn name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import java.util.Arrays;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -42,7 +42,7 @@ public class BindRequestImpl extends Abs
      * Distinguished name identifying the name of the authenticating subject -
      * defaults to the empty string
      */
-    private DN name;
+    private Dn name;
 
     /** The passwords, keys or tickets used to verify user identity */
     private byte[] credentials;
@@ -220,11 +220,11 @@ public class BindRequestImpl extends Abs
      * request. This field may take on a null value (a zero length string) for
      * the purposes of anonymous binds, when authentication has been performed
      * at a lower layer, or when using SASL credentials with a mechanism that
-     * includes the DN in the credentials.
+     * includes the Dn in the credentials.
      * 
-     * @return the DN of the authenticating user.
+     * @return the Dn of the authenticating user.
      */
-    public DN getName()
+    public Dn getName()
     {
         return name;
     }
@@ -235,13 +235,13 @@ public class BindRequestImpl extends Abs
      * request. This field may take on a null value (or a zero length string)
      * for the purposes of anonymous binds, when authentication has been
      * performed at a lower layer, or when using SASL credentials with a
-     * mechanism that includes the DN in the credentials.
+     * mechanism that includes the Dn in the credentials.
      * 
      * @param name
-     *            the DN of the authenticating user - leave null for annonymous
+     *            the Dn of the authenticating user - leave null for annonymous
      *            user.
      */
-    public void setName( DN name )
+    public void setName( Dn name )
     {
         this.name = name;
     }
@@ -374,8 +374,8 @@ public class BindRequestImpl extends Abs
             return false;
         }
 
-        DN dn1 = req.getName();
-        DN dn2 = getName();
+        Dn dn1 = req.getName();
+        Dn dn2 = getName();
 
         if ( dn1 == null )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -43,18 +43,18 @@ public interface CompareRequest extends 
      * Gets the distinguished name of the entry to be compared using the
      * attribute value assertion.
      * 
-     * @return the DN of the compared entry.
+     * @return the Dn of the compared entry.
      */
-    DN getName();
+    Dn getName();
 
 
     /**
      * Sets the distinguished name of the entry to be compared using the
      * attribute value assertion.
      * 
-     * @param name the DN of the compared entry.
+     * @param name the Dn of the compared entry.
      */
-    void setName( DN name );
+    void setName( Dn name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -38,7 +38,7 @@ public class CompareRequestImpl extends 
     static final long serialVersionUID = 1699731530016468977L;
 
     /** Distinguished name identifying the compared entry */
-    private DN name;
+    private Dn name;
 
     /** The id of the attribute used in the comparison */
     private String attrId;
@@ -95,9 +95,9 @@ public class CompareRequestImpl extends 
      * Gets the distinguished name of the entry to be compared using the
      * attribute value assertion.
      * 
-     * @return the DN of the compared entry.
+     * @return the Dn of the compared entry.
      */
-    public DN getName()
+    public Dn getName()
     {
         return name;
     }
@@ -107,9 +107,9 @@ public class CompareRequestImpl extends 
      * Sets the distinguished name of the entry to be compared using the
      * attribute value assertion.
      * 
-     * @param name the DN of the compared entry.
+     * @param name the Dn of the compared entry.
      */
-    public void setName( DN name )
+    public void setName( Dn name )
     {
         this.name = name;
     }
@@ -340,7 +340,7 @@ public class CompareRequestImpl extends 
         }
 
         CompareRequest req = ( CompareRequest ) obj;
-        DN reqName = req.getName();
+        Dn reqName = req.getName();
 
         if ( ( name != null ) && ( reqName == null ) )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java Sun Jan 23 01:17:06 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.message;
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -42,16 +42,16 @@ public interface DeleteRequest extends S
      * Gets the distinguished name of the leaf entry to be deleted by this
      * request.
      * 
-     * @return the DN of the leaf entry to delete.
+     * @return the Dn of the leaf entry to delete.
      */
-    DN getName();
+    Dn getName();
 
 
     /**
      * Sets the distinguished name of the leaf entry to be deleted by this
      * request.
      * 
-     * @param name the DN of the leaf entry to delete.
+     * @param name the Dn of the leaf entry to delete.
      */
-    void setName( DN name );
+    void setName( Dn name );
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -34,7 +34,7 @@ public class DeleteRequestImpl extends A
     static final long serialVersionUID = 3187847454305567542L;
 
     /** The distinguished name of the entry to delete */
-    private DN name;
+    private Dn name;
 
     /** The deleteResponse associated with this request */
     private DeleteResponse response;
@@ -74,9 +74,9 @@ public class DeleteRequestImpl extends A
      * Gets the distinguished name of the leaf entry to be deleted by this
      * request.
      * 
-     * @return the DN of the leaf entry to delete.
+     * @return the Dn of the leaf entry to delete.
      */
-    public DN getName()
+    public Dn getName()
     {
         return name;
     }
@@ -86,9 +86,9 @@ public class DeleteRequestImpl extends A
      * Sets the distinguished name of the leaf entry to be deleted by this
      * request.
      * 
-     * @param name the DN of the leaf entry to delete.
+     * @param name the Dn of the leaf entry to delete.
      */
-    public void setName( DN name )
+    public void setName( Dn name )
     {
         this.name = name;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -402,8 +402,8 @@ public class LdapEncoder
             throw new IllegalArgumentException( I18n.err( I18n.ERR_04481_ENTRY_NULL_VALUE ) );
         }
 
-        // The entry DN
-        int addRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry.getDn() ) ) + DN.getNbBytes( entry.getDn() );
+        // The entry Dn
+        int addRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(entry.getDn()) ) + Dn.getNbBytes(entry.getDn());
 
         // The attributes sequence
         int entryLength = 0;
@@ -502,8 +502,8 @@ public class LdapEncoder
         int bindRequestLength = 1 + 1 + 1; // Initialized with version
 
         // The name
-        bindRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( bindRequest.getName() ) )
-            + DN.getNbBytes( bindRequest.getName() );
+        bindRequestLength += 1 + TLV.getNbBytes( Dn.getNbBytes(bindRequest.getName()) )
+            + Dn.getNbBytes(bindRequest.getName());
 
         byte[] credentials = bindRequest.getCredentials();
 
@@ -602,9 +602,9 @@ public class LdapEncoder
      */
     private int computeCompareRequestLength( CompareRequestImpl compareRequest )
     {
-        // The entry DN
-        DN entry = compareRequest.getName();
-        int compareRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry ) ) + DN.getNbBytes( entry );
+        // The entry Dn
+        Dn entry = compareRequest.getName();
+        int compareRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(entry) ) + Dn.getNbBytes(entry);
 
         // The attribute value assertion
         byte[] attributeIdBytes = Strings.getBytesUtf8(compareRequest.getAttributeId());
@@ -668,7 +668,7 @@ public class LdapEncoder
     private int computeDeleteRequestLength( DeleteRequestImpl deleteRequest )
     {
         // The entry
-        return 1 + TLV.getNbBytes( DN.getNbBytes( deleteRequest.getName() ) ) + DN.getNbBytes( deleteRequest.getName() );
+        return 1 + TLV.getNbBytes( Dn.getNbBytes(deleteRequest.getName()) ) + Dn.getNbBytes(deleteRequest.getName());
     }
 
 
@@ -864,8 +864,8 @@ public class LdapEncoder
     private int computeModifyRequestLength( ModifyRequestImpl modifyRequest )
     {
         // Initialized with name
-        int modifyRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( modifyRequest.getName() ) )
-            + DN.getNbBytes( modifyRequest.getName() );
+        int modifyRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(modifyRequest.getName()) )
+            + Dn.getNbBytes(modifyRequest.getName());
 
         // All the changes length
         int changesLength = 0;
@@ -977,14 +977,14 @@ public class LdapEncoder
     {
         int newRdnlength = Strings.getBytesUtf8(modifyDnResponse.getNewRdn().getName()).length;
 
-        int modifyDNRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( modifyDnResponse.getName() ) )
-            + DN.getNbBytes( modifyDnResponse.getName() ) + 1 + TLV.getNbBytes( newRdnlength ) + newRdnlength + 1 + 1
+        int modifyDNRequestLength = 1 + TLV.getNbBytes( Dn.getNbBytes(modifyDnResponse.getName()) )
+            + Dn.getNbBytes(modifyDnResponse.getName()) + 1 + TLV.getNbBytes( newRdnlength ) + newRdnlength + 1 + 1
             + 1; // deleteOldRDN
 
         if ( modifyDnResponse.getNewSuperior() != null )
         {
-            modifyDNRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( modifyDnResponse.getNewSuperior() ) )
-                + DN.getNbBytes( modifyDnResponse.getNewSuperior() );
+            modifyDNRequestLength += 1 + TLV.getNbBytes( Dn.getNbBytes(modifyDnResponse.getNewSuperior()) )
+                + Dn.getNbBytes(modifyDnResponse.getNewSuperior());
         }
 
         modifyDnResponse.setModifyDnRequestLength( modifyDNRequestLength );
@@ -1079,8 +1079,8 @@ public class LdapEncoder
         int searchRequestLength = 0;
 
         // The baseObject
-        searchRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( searchRequest.getBase() ) )
-            + DN.getNbBytes( searchRequest.getBase() );
+        searchRequestLength += 1 + TLV.getNbBytes( Dn.getNbBytes(searchRequest.getBase()) )
+            + Dn.getNbBytes(searchRequest.getBase());
 
         // The scope
         searchRequestLength += 1 + 1 + 1;
@@ -1189,7 +1189,7 @@ public class LdapEncoder
      */
     private int computeSearchResultEntryLength( SearchResultEntryImpl searchResultEntry )
     {
-        DN dn = searchResultEntry.getObjectName();
+        Dn dn = searchResultEntry.getObjectName();
 
         byte[] dnBytes = Strings.getBytesUtf8(dn.getName());
 
@@ -1386,7 +1386,7 @@ public class LdapEncoder
             buffer.put( TLV.getBytes( addRequest.getAddRequestLength() ) );
 
             // The entry
-            Value.encode( buffer, DN.getBytes( addRequest.getEntryDn() ) );
+            Value.encode( buffer, Dn.getBytes(addRequest.getEntryDn()) );
 
             // The attributes sequence
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -1498,7 +1498,7 @@ public class LdapEncoder
         Value.encode( buffer, 3 );
 
         // The name
-        Value.encode( buffer, DN.getBytes( bindRequest.getName() ) );
+        Value.encode( buffer, Dn.getBytes(bindRequest.getName()) );
 
         byte[] credentials = bindRequest.getCredentials();
 
@@ -1626,7 +1626,7 @@ public class LdapEncoder
             buffer.put( TLV.getBytes( compareRequest.getCompareRequestLength() ) );
 
             // The entry
-            Value.encode( buffer, DN.getBytes( compareRequest.getName() ) );
+            Value.encode( buffer, Dn.getBytes(compareRequest.getName()) );
 
             // The attributeValueAssertion sequence Tag
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -1685,8 +1685,8 @@ public class LdapEncoder
             buffer.put( LdapConstants.DEL_REQUEST_TAG );
 
             // The entry
-            buffer.put( TLV.getBytes( DN.getNbBytes( deleteRequest.getName() ) ) );
-            buffer.put( DN.getBytes( deleteRequest.getName() ) );
+            buffer.put( TLV.getBytes( Dn.getNbBytes(deleteRequest.getName()) ) );
+            buffer.put( Dn.getBytes(deleteRequest.getName()) );
         }
         catch ( BufferOverflowException boe )
         {
@@ -1920,7 +1920,7 @@ public class LdapEncoder
             buffer.put( TLV.getBytes( modifyRequest.getModifyRequestLength() ) );
 
             // The entry
-            Value.encode( buffer, DN.getBytes( modifyRequest.getName() ) );
+            Value.encode( buffer, Dn.getBytes(modifyRequest.getName()) );
 
             // The modifications sequence
             buffer.put( UniversalTag.SEQUENCE.getValue() );
@@ -2035,7 +2035,7 @@ public class LdapEncoder
 
             // The entry
 
-            Value.encode( buffer, DN.getBytes( modifyDnRequest.getName() ) );
+            Value.encode( buffer, Dn.getBytes(modifyDnRequest.getName()) );
 
             // The newRDN
             Value.encode( buffer, modifyDnRequest.getNewRdn().getName() );
@@ -2049,13 +2049,13 @@ public class LdapEncoder
                 // Encode the reference
                 buffer.put( ( byte ) LdapConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG );
 
-                int newSuperiorLength = DN.getNbBytes( modifyDnRequest.getNewSuperior() );
+                int newSuperiorLength = Dn.getNbBytes(modifyDnRequest.getNewSuperior());
 
                 buffer.put( TLV.getBytes( newSuperiorLength ) );
 
                 if ( newSuperiorLength != 0 )
                 {
-                    buffer.put( DN.getBytes( modifyDnRequest.getNewSuperior() ) );
+                    buffer.put( Dn.getBytes(modifyDnRequest.getNewSuperior()) );
                 }
             }
         }
@@ -2121,7 +2121,7 @@ public class LdapEncoder
             buffer.put( TLV.getBytes( searchRequest.getSearchRequestLength() ) );
 
             // The baseObject
-            Value.encode( buffer, DN.getBytes( searchRequest.getBase() ) );
+            Value.encode( buffer, Dn.getBytes(searchRequest.getBase()) );
 
             // The scope
             Value.encodeEnumerated( buffer, searchRequest.getScope().getScope() );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.ldap.message;
 
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -75,7 +75,7 @@ public interface LdapResult
      * 
      * @return the Dn of the lowest matched entry.
      */
-    DN getMatchedDn();
+    Dn getMatchedDn();
 
 
     /**
@@ -84,7 +84,7 @@ public interface LdapResult
      * @see #getMatchedDn()
      * @param dn the Dn of the lowest matched entry.
      */
-    void setMatchedDn( DN dn );
+    void setMatchedDn( Dn dn );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.ldap.message;
 
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -34,7 +34,7 @@ public class LdapResultImpl implements L
     static final long serialVersionUID = -1446626887394613213L;
 
     /** Lowest matched entry Dn - defaults to empty string */
-    private DN matchedDn;
+    private Dn matchedDn;
 
     /** Temporary storage of the byte[] representing the matchedDN */
     private byte[] matchedDnBytes;
@@ -112,7 +112,7 @@ public class LdapResultImpl implements L
      * 
      * @return the Dn of the lowest matched entry.
      */
-    public DN getMatchedDn()
+    public Dn getMatchedDn()
     {
         return matchedDn;
     }
@@ -133,7 +133,7 @@ public class LdapResultImpl implements L
      * @see #getMatchedDn()
      * @param matchedDn the Dn of the lowest matched entry.
      */
-    public void setMatchedDn( DN matchedDn )
+    public void setMatchedDn( Dn matchedDn )
     {
         this.matchedDn = matchedDn;
     }
@@ -572,7 +572,7 @@ public class LdapResultImpl implements L
                 }
         }
 
-        sb.append( "            Matched DN : '" ).append( matchedDn ).append( "'\n" );
+        sb.append( "            Matched Dn : '" ).append( matchedDn ).append( "'\n" );
         sb.append( "            Error message : '" ).append( errorMessage ).append( "'\n" );
 
         if ( referral != null )

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java Sun Jan 23 01:17:06 2011
@@ -20,23 +20,23 @@
 package org.apache.directory.shared.ldap.message;
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 
 
 /**
- * Modify DN request protocol message used to rename or move an existing entry
+ * Modify Dn request protocol message used to rename or move an existing entry
  * in the directory. Here's what <a
  * href="http://www.faqs.org/rfcs/rfc2251.html">RFC 2251</a> has to say about
  * it:
  * 
  * <pre>
- *  4.9. Modify DN Operation
+ *  4.9. Modify Dn Operation
  * 
- *   The Modify DN Operation allows a client to change the leftmost (least
+ *   The Modify Dn Operation allows a client to change the leftmost (least
  *   significant) component of the name of an entry in the directory, or
  *   to move a subtree of entries to a new location in the directory.  The
- *   Modify DN Request is defined as follows:
+ *   Modify Dn Request is defined as follows:
  * 
  *        ModifyDNRequest ::= [APPLICATION 12] SEQUENCE {
  *                entry           LDAPDN,
@@ -44,15 +44,15 @@ import org.apache.directory.shared.ldap.
  *                deleteoldrdn    BOOLEAN,
  *                newSuperior     [0] LDAPDN OPTIONAL }
  * 
- *   Parameters of the Modify DN Request are:
+ *   Parameters of the Modify Dn Request are:
  * 
  *   - entry: the Distinguished Name of the entry to be changed.  This
  *     entry may or may not have subordinate entries.
  * 
- *   - newrdn: the RDN that will form the leftmost component of the new
+ *   - newrdn: the Rdn that will form the leftmost component of the new
  *     name of the entry.
  * 
- *   - deleteoldrdn: a boolean parameter that controls whether the old RDN
+ *   - deleteoldrdn: a boolean parameter that controls whether the old Rdn
  *     attribute values are to be retained as attributes of the entry, or
  *     deleted from the entry.
  * 
@@ -67,10 +67,10 @@ import org.apache.directory.shared.ldap.
  */
 public interface ModifyDnRequest extends SingleReplyRequest, AbandonableRequest
 {
-    /** Modify DN request message type enumeration value */
+    /** Modify Dn request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_REQUEST;
 
-    /** Modify DN response message type enumeration value */
+    /** Modify Dn response message type enumeration value */
     MessageTypeEnum RESP_TYPE = ModifyDnResponse.TYPE;
 
 
@@ -80,7 +80,7 @@ public interface ModifyDnRequest extends
      * 
      * @return the distinguished name of the entry.
      */
-    DN getName();
+    Dn getName();
 
 
     /**
@@ -90,7 +90,7 @@ public interface ModifyDnRequest extends
      * @param name
      *            the distinguished name of the entry.
      */
-    void setName( DN name );
+    void setName( Dn name );
 
 
     /**
@@ -99,7 +99,7 @@ public interface ModifyDnRequest extends
      * 
      * @return the relative dn with one component
      */
-    RDN getNewRdn();
+    Rdn getNewRdn();
 
 
     /**
@@ -109,7 +109,7 @@ public interface ModifyDnRequest extends
      * @param newRdn
      *            the relative dn with one component
      */
-    void setNewRdn( RDN newRdn );
+    void setNewRdn( Rdn newRdn );
 
 
     /**
@@ -141,7 +141,7 @@ public interface ModifyDnRequest extends
      * 
      * @return the dn of the superior entry the candidate entry is moved under.
      */
-    DN getNewSuperior();
+    Dn getNewSuperior();
 
 
     /**
@@ -152,14 +152,14 @@ public interface ModifyDnRequest extends
      * toggles the move flag obtained via the <code>isMove</code> method.
      * 
      * @param newSuperior
-     *            the dn of the superior entry the candidate entry for DN
+     *            the dn of the superior entry the candidate entry for Dn
      *            modification is moved under.
      */
-    void setNewSuperior( DN newSuperior );
+    void setNewSuperior( Dn newSuperior );
 
 
     /**
-     * Gets whether or not this request is a DN change resulting in a move
+     * Gets whether or not this request is a Dn change resulting in a move
      * operation. Setting the newSuperior property to a non-null name, toggles
      * this flag.
      * 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 
 
 /**
@@ -35,13 +35,13 @@ public class ModifyDnRequestImpl extends
     static final long serialVersionUID = 1233507339633051696L;
 
     /** PDU's modify Dn candidate <b>entry</b> distinguished name property */
-    private DN name;
+    private Dn name;
 
     /** PDU's <b>newrdn</b> relative distinguished name property */
-    private RDN newRdn;
+    private Rdn newRdn;
 
     /** PDU's <b>newSuperior</b> distinguished name property */
-    private DN newSuperior;
+    private Dn newSuperior;
 
     /** PDU's <b>deleteOldRdn</b> flag */
     private boolean deleteOldRdn = false;
@@ -49,7 +49,7 @@ public class ModifyDnRequestImpl extends
     /** The associated response */
     private ModifyDnResponse response;
 
-    /** The modify DN request length */
+    /** The modify Dn request length */
     private int modifyDnRequestLength;
 
 
@@ -109,7 +109,7 @@ public class ModifyDnRequestImpl extends
 
 
     /**
-     * Gets whether or not this request is a DN change resulting in a move
+     * Gets whether or not this request is a Dn change resulting in a move
      * operation. Setting the newSuperior property to a non-null name, toggles
      * this flag.
      * 
@@ -128,7 +128,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the distinguished name of the entry.
      */
-    public DN getName()
+    public Dn getName()
     {
         return name;
     }
@@ -141,7 +141,7 @@ public class ModifyDnRequestImpl extends
      * @param name
      *            the distinguished name of the entry.
      */
-    public void setName( DN name )
+    public void setName( Dn name )
     {
         this.name = name;
     }
@@ -153,7 +153,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the relative dn with one component
      */
-    public RDN getNewRdn()
+    public Rdn getNewRdn()
     {
         return newRdn;
     }
@@ -165,7 +165,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @param newRdn the relative dn with one component
      */
-    public void setNewRdn( RDN newRdn )
+    public void setNewRdn( Rdn newRdn )
     {
         this.newRdn = newRdn;
     }
@@ -179,7 +179,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the dn of the superior entry the candidate entry is moved under.
      */
-    public DN getNewSuperior()
+    public Dn getNewSuperior()
     {
         return newSuperior;
     }
@@ -192,10 +192,10 @@ public class ModifyDnRequestImpl extends
      * rather than a move operation. Setting this property to a non-null value
      * toggles the move flag obtained via the <code>isMove</code> method.
      * 
-     * @param newSuperior the dn of the superior entry the candidate entry for DN
+     * @param newSuperior the dn of the superior entry the candidate entry for Dn
      *            modification is moved under.
      */
-    public void setNewSuperior( DN newSuperior )
+    public void setNewSuperior( Dn newSuperior )
     {
         this.newSuperior = newSuperior;
     }
@@ -368,9 +368,9 @@ public class ModifyDnRequestImpl extends
         sb.append( "        Entry : '" ).append( name ).append( "'\n" );
         if ( newRdn != null )
         {
-            sb.append( "        New RDN : '" ).append( newRdn.toString() ).append( "'\n" );
+            sb.append( "        New Rdn : '" ).append( newRdn.toString() ).append( "'\n" );
         }
-        sb.append( "        Delete old RDN : " ).append( deleteOldRdn ).append( "\n" );
+        sb.append( "        Delete old Rdn : " ).append( deleteOldRdn ).append( "\n" );
 
         if ( newSuperior != null )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java Sun Jan 23 01:17:06 2011
@@ -24,13 +24,13 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * Modify DN protocol response message used to confirm the results of a modify
- * DN request message.
+ * Modify Dn protocol response message used to confirm the results of a modify
+ * Dn request message.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public interface ModifyDnResponse extends ResultResponse
 {
-    /** Modify DN response message type enumeration value */
+    /** Modify Dn response message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_RESPONSE;
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java Sun Jan 23 01:17:06 2011
@@ -86,7 +86,7 @@ public class ModifyDnResponseImpl extend
 
         StringBuilder sb = new StringBuilder();
 
-        sb.append( "    Modify DN Response\n" );
+        sb.append( "    Modify Dn Response\n" );
         sb.append( super.toString() );
 
         return sb.toString();

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
  *   Parameters of the Modify Request are:
  * 
  *   - object: The object to be modified. The value of this field contains
- *     the DN of the entry to be modified.  The server will not perform
+ *     the Dn of the entry to be modified.  The server will not perform
  *     any alias dereferencing in determining the object to be modified.
  * 
  *   - modification: A list of modifications to be performed on the entry.
@@ -110,9 +110,9 @@ public interface ModifyRequest extends S
      * Gets the distinguished name of the entry to be modified by this request.
      * This property represents the PDU's <b>object</b> field.
      * 
-     * @return the DN of the modified entry.
+     * @return the Dn of the modified entry.
      */
-    DN getName();
+    Dn getName();
 
 
     /**
@@ -120,9 +120,9 @@ public interface ModifyRequest extends S
      * This property represents the PDU's <b>object</b> field.
      * 
      * @param name
-     *            the DN of the modified entry.
+     *            the Dn of the modified entry.
      */
-    void setName( DN name );
+    void setName( Dn name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.StringConstants;
 
 
@@ -47,7 +47,7 @@ public class ModifyRequestImpl extends A
     static final long serialVersionUID = -505803669028990304L;
 
     /** Dn of the entry to modify or PDU's <b>object</b> field */
-    private DN name;
+    private Dn name;
 
     /** Sequence of modifications or PDU's <b>modification</b> seqence field */
     private List<Modification> mods = new ArrayList<Modification>();
@@ -122,9 +122,9 @@ public class ModifyRequestImpl extends A
      * Gets the distinguished name of the entry to be modified by this request.
      * This property represents the PDU's <b>object</b> field.
      * 
-     * @return the DN of the modified entry.
+     * @return the Dn of the modified entry.
      */
-    public DN getName()
+    public Dn getName()
     {
         return name;
     }
@@ -134,9 +134,9 @@ public class ModifyRequestImpl extends A
      * Sets the distinguished name of the entry to be modified by this request.
      * This property represents the PDU's <b>object</b> field.
      * 
-     * @param name the DN of the modified entry.
+     * @param name the Dn of the modified entry.
      */
-    public void setName( DN name )
+    public void setName( Dn name )
     {
         this.name = name;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java Sun Jan 23 01:17:06 2011
@@ -70,7 +70,7 @@ import java.util.Collection;
  *   of the new request may be the same or different as the request which
  *   generated the referral.
  * 
- *   Note that UTF-8 characters appearing in a DN or search filter may not
+ *   Note that UTF-8 characters appearing in a Dn or search filter may not
  *   be legal for URLs (e.g. spaces) and MUST be escaped using the %
  *   method in RFC 1738 &lt;a href=&quot;http://www.faqs.org/rfcs/rfc1738.html&quot;&gt;[7]&lt;/a&gt;.
  * 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java Sun Jan 23 01:17:06 2011
@@ -299,8 +299,8 @@ public enum ResultCodeEnum
     INAPPROPRIATE_AUTHENTICATION( 48, "inappropriateAuthentication" ),
 
     /**
-     * This error code is returned if the DN or password used in a simple bind
-     * operation is incorrect, or if the DN or password is incorrect for some
+     * This error code is returned if the Dn or password used in a simple bind
+     * operation is incorrect, or if the Dn or password is incorrect for some
      * other reason, e.g. the password has expired. This result code only
      * applies to Bind operations -- it should not be returned for other
      * operations if the client does not have sufficient permission to perform
@@ -532,8 +532,8 @@ public enum ResultCodeEnum
     ALIAS_PROBLEM( 33, "aliasProblem" ),
 
     /**
-     * This error should be returned by the server if the DN syntax is
-     * incorrect. It should not be returned if the DN is correctly formed but
+     * This error should be returned by the server if the Dn syntax is
+     * incorrect. It should not be returned if the Dn is correctly formed but
      * represents an entry which is not permitted by the structure rules at the
      * DSA ; in this case namingViolation should be returned instead. Applicable
      * operations: all. Result code type: Specific (Name)
@@ -552,7 +552,7 @@ public enum ResultCodeEnum
      * of the DIT as defined in the directory schema and X.501. That is, it
      * would place an entry as the subordinate of an alias entry, or in a region
      * of the DIT not permitted to a member of its object class, or would define
-     * an RDN for an entry to include a forbidden attribute type [X511, Section
+     * an Rdn for an entry to include a forbidden attribute type [X511, Section
      * 12.9]. Applicable operations: Add, ModifyDN. Result code type: Specific
      * (Update)
      */
@@ -577,16 +577,16 @@ public enum ResultCodeEnum
      * operation which is permitted only on leaf entries - e.g., if the client
      * attempts to delete a non-leaf entry. If the directory does not permit
      * ModifyDN for non-leaf entries then this error may be returned if the
-     * client attempts to change the DN of a non-leaf entry. (Note that 1988
-     * edition X.500 servers only permitted change of the RDN of an entry's DN
+     * client attempts to change the Dn of a non-leaf entry. (Note that 1988
+     * edition X.500 servers only permitted change of the Rdn of an entry's Dn
      * [X.511, Section 11.4.1]). Applicable operations: Delete, ModifyDN. Result
      * code type: Specific (Update)
      */
     NOT_ALLOWED_ON_NON_LEAF( 66, "notAllowedOnNonLeaf" ),
 
     /**
-     * The attempted operation would affect the RDN (e.g., removal of an
-     * attribute which is a part of the RDN) [X511, Section 12.9]. If the client
+     * The attempted operation would affect the Rdn (e.g., removal of an
+     * attribute which is a part of the Rdn) [X511, Section 12.9]. If the client
      * attempts to remove from an entry any of its distinguished values, those
      * values which form the entry's relative distinguished name the server
      * should return the error notAllowedOnRDN. [RFC2251, Section 4.6]

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -63,7 +63,7 @@ public interface SearchRequest extends M
      * 
      * @return the search base
      */
-    DN getBase();
+    Dn getBase();
 
 
     /**
@@ -71,7 +71,7 @@ public interface SearchRequest extends M
      * 
      * @param baseDn the search base
      */
-    void setBase( DN baseDn );
+    void setBase( Dn baseDn );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Sun Jan 23 01:17:06 2011
@@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -75,7 +75,7 @@ public class SearchRequestImpl extends A
     static final long serialVersionUID = -5655881944020886218L;
 
     /** Search base distinguished name */
-    private DN baseDn;
+    private Dn baseDn;
 
     /** A temporary storage for a terminal Filter */
     private Filter terminalFilter;
@@ -470,7 +470,7 @@ public class SearchRequestImpl extends A
      * 
      * @return the search base
      */
-    public DN getBase()
+    public Dn getBase()
     {
         return baseDn;
     }
@@ -482,7 +482,7 @@ public class SearchRequestImpl extends A
      * @param base
      *            the search base
      */
-    public void setBase( DN base )
+    public void setBase( Dn base )
     {
         baseDn = base;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -45,7 +45,7 @@ public interface SearchResultEntry exten
      * 
      * @return the Dn of the entry returned.
      */
-    DN getObjectName();
+    Dn getObjectName();
 
 
     /**
@@ -53,7 +53,7 @@ public interface SearchResultEntry exten
      * 
      * @param objectName the Dn of the entry returned.
      */
-    void setObjectName( DN objectName );
+    void setObjectName( Dn objectName );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -158,7 +158,7 @@ public class SearchResultEntryImpl exten
      * 
      * @return the Dn of the entry returned.
      */
-    public DN getObjectName()
+    public Dn getObjectName()
     {
         return ( entry == null ? null : entry.getDn() );
     }
@@ -191,7 +191,7 @@ public class SearchResultEntryImpl exten
      * 
      * @param objectName the Dn of the entry returned.
      */
-    public void setObjectName( DN objectName )
+    public void setObjectName( Dn objectName )
     {
         if ( entry != null )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java Sun Jan 23 01:17:06 2011
@@ -58,9 +58,9 @@ public class CertGenerationRequest exten
      * Creates a new instance of CertGenerationRequest.
      *
      * @param messageId the message id
-     * @param targerDN the DN of target entry whose key and certificate values will be changed 
-     * @param issuerDN DN to be used as the issuer's DN in the certificate
-     * @param subjectDN DN to be used as certificate's subject
+     * @param targerDN the Dn of target entry whose key and certificate values will be changed
+     * @param issuerDN Dn to be used as the issuer's Dn in the certificate
+     * @param subjectDN Dn to be used as certificate's subject
      * @param keyAlgorithm crypto algorithm name to be used for generating the keys
      */
     public CertGenerationRequest( int messageId, String targerDN, String issuerDN, String subjectDN, String keyAlgorithm )

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Ava.java (from r1062292, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Ava.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Ava.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java&r1=1062292&r2=1062306&rev=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVA.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Ava.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * A Attribute Type And Value, which is the basis of all RDN. It contains a
+ * A Attribute Type And Value, which is the basis of all Rdn. It contains a
  * type, and a value. The type must not be case sensitive. Superfluous leading
  * and trailing spaces MUST have been trimmed before. The value MUST be in UTF8
  * format, according to RFC 2253. If the type is in OID form, then the value
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AVA implements Cloneable, Comparable<Object>, Externalizable
+public class Ava implements Cloneable, Comparable<Object>, Externalizable
 {
     /**
      * Declares the Serial Version Uid.
@@ -65,7 +65,7 @@ public class AVA implements Cloneable, C
     private static final long serialVersionUID = 1L;
 
     /** The LoggerFactory used by this class */
-    private static final Logger LOG = LoggerFactory.getLogger( AVA.class );
+    private static final Logger LOG = LoggerFactory.getLogger( Ava.class );
 
     /** The normalized Name type */
     private String normType;
@@ -79,7 +79,7 @@ public class AVA implements Cloneable, C
     /** The name user provided value. It can be a String or a byte array */
     private Value<?> upValue;
 
-    /** The user provided AVA */
+    /** The user provided Ava */
     private String upName;
 
     /** The starting position of this atav in the given string from which
@@ -97,9 +97,9 @@ public class AVA implements Cloneable, C
 
 
     /**
-     * Construct an empty AVA
+     * Construct an empty Ava
      */
-    public AVA()
+    public Ava()
     {
         normType = null;
         upType = null;
@@ -112,7 +112,7 @@ public class AVA implements Cloneable, C
 
     
     /**
-     * Construct an AVA. The type and value are normalized :
+     * Construct an Ava. The type and value are normalized :
      * <li> the type is trimmed and lowercased </li>
      * <li> the value is trimmed </li>
      * <p>
@@ -124,7 +124,7 @@ public class AVA implements Cloneable, C
      * @param upValue The User Provided value
      * @param normValue The normalized value
      */
-    public AVA( String upType, String normType, String upValue, String normValue ) throws LdapInvalidDnException
+    public Ava(String upType, String normType, String upValue, String normValue) throws LdapInvalidDnException
     {
         this( upType, normType, new StringValue( upValue ), new StringValue( normValue ) );
     }
@@ -133,7 +133,7 @@ public class AVA implements Cloneable, C
 
     
     /**
-     * Construct an AVA. The type and value are normalized :
+     * Construct an Ava. The type and value are normalized :
      * <li> the type is trimmed and lowercased </li>
      * <li> the value is trimmed </li>
      * <p>
@@ -145,14 +145,14 @@ public class AVA implements Cloneable, C
      * @param upValue The User Provided value
      * @param normValue The normalized value
      */
-    public AVA( String upType, String normType, byte[] upValue, byte[] normValue ) throws LdapInvalidDnException
+    public Ava(String upType, String normType, byte[] upValue, byte[] normValue) throws LdapInvalidDnException
     {
         this( upType, normType, new BinaryValue( upValue ), new BinaryValue( normValue ) );
     }
 
 
     /**
-     * Construct an AVA. The type and value are normalized :
+     * Construct an Ava. The type and value are normalized :
      * <li> the type is trimmed and lowercased </li>
      * <li> the value is trimmed </li>
      * <p>
@@ -164,7 +164,7 @@ public class AVA implements Cloneable, C
      * @param upValue The User Provided value
      * @param normValue The normalized value
      */
-    public AVA( String upType, String normType, Value<?> upValue, Value<?> normValue ) throws LdapInvalidDnException
+    public Ava(String upType, String normType, Value<?> upValue, Value<?> normValue) throws LdapInvalidDnException
     {
         String upTypeTrimmed = Strings.trim(upType);
         String normTypeTrimmed = Strings.trim(normType);
@@ -207,7 +207,7 @@ public class AVA implements Cloneable, C
 
 
     /**
-     * Construct an AVA. The type and value are normalized :
+     * Construct an Ava. The type and value are normalized :
      * <li> the type is trimmed and lowercased </li>
      * <li> the value is trimmed </li>
      * <p>
@@ -220,7 +220,7 @@ public class AVA implements Cloneable, C
      * @param normValue The normalized value
      * @param upName The User Provided name (may be escaped)
      */
-    public AVA( String upType, String normType, Value<?> upValue, Value<?> normValue, String upName )
+    public Ava(String upType, String normType, Value<?> upValue, Value<?> normValue, String upName)
         throws LdapInvalidDnException
     {
         String upTypeTrimmed = Strings.trim(upType);
@@ -264,7 +264,7 @@ public class AVA implements Cloneable, C
 
 
     /**
-     * Get the normalized type of a AVA
+     * Get the normalized type of a Ava
      *
      * @return The normalized type
      */
@@ -274,7 +274,7 @@ public class AVA implements Cloneable, C
     }
 
     /**
-     * Get the user provided type of a AVA
+     * Get the user provided type of a Ava
      *
      * @return The user provided type
      */
@@ -285,7 +285,7 @@ public class AVA implements Cloneable, C
 
 
     /**
-     * Get the Value of a AVA
+     * Get the Value of a Ava
      *
      * @return The value
      */
@@ -295,7 +295,7 @@ public class AVA implements Cloneable, C
     }
 
     /**
-     * Get the User Provided Value of a AVA
+     * Get the User Provided Value of a Ava
      *
      * @return The value
      */
@@ -305,7 +305,7 @@ public class AVA implements Cloneable, C
     }
 
     /**
-     * Get the normalized Name of a AVA
+     * Get the normalized Name of a Ava
      *
      * @return The name
      */
@@ -353,11 +353,11 @@ public class AVA implements Cloneable, C
      *
      * @return a clone of this object
      */
-    public AVA clone()
+    public Ava clone()
     {
         try
         {
-            AVA clone = ( AVA ) super.clone();
+            Ava clone = (Ava) super.clone();
             clone.upValue = upValue.clone();
             clone.normValue = normValue.clone();
             
@@ -382,9 +382,9 @@ public class AVA implements Cloneable, C
      */
     public int compareTo( Object object )
     {
-        if ( object instanceof AVA )
+        if ( object instanceof Ava)
         {
-            AVA nc = ( AVA ) object;
+            Ava nc = (Ava) object;
 
             int res = compareType( normType, nc.normType );
 
@@ -416,9 +416,9 @@ public class AVA implements Cloneable, C
      */
     public int compareToIgnoreCase( Object object )
     {
-        if ( object instanceof AVA )
+        if ( object instanceof Ava)
         {
-            AVA nc = ( AVA ) object;
+            Ava nc = (Ava) object;
 
             int res = compareType( normType, nc.normType );
 
@@ -595,12 +595,12 @@ public class AVA implements Cloneable, C
     }
 
     /**
-     * A Normalized String representation of a AVA : 
+     * A Normalized String representation of a Ava :
      * - type is trimed and lowercased 
      * - value is trimed and lowercased, and special characters
      * are escaped if needed.
      *
-     * @return A normalized string representing a AVA
+     * @return A normalized string representing a Ava
      */
     public String normalize()
     {
@@ -655,12 +655,12 @@ public class AVA implements Cloneable, C
             return true;
         }
         
-        if ( !( obj instanceof AVA ) )
+        if ( !( obj instanceof Ava) )
         {
             return false;
         }
         
-        AVA instance = (AVA)obj;
+        Ava instance = (Ava)obj;
      
         // Compare the type
         if ( normType == null )
@@ -692,14 +692,14 @@ public class AVA implements Cloneable, C
     
     /**
      * 
-     * An AVA is composed of  a type and a value.
+     * An Ava is composed of  a type and a value.
      * The data are stored following the structure :
      * <ul>
      *   <li>
      *     <b>upName</b> The User provided ATAV
      *   </li>
      *   <li>
-     *     <b>start</b> The position of this ATAV in the DN
+     *     <b>start</b> The position of this ATAV in the Dn
      *   </li>
      *   <li>
      *     <b>length</b> The ATAV length
@@ -815,7 +815,7 @@ public class AVA implements Cloneable, C
     
     /**
      * We read back the data to create a new ATAV. The structure 
-     * read is exposed in the {@link AVA#writeExternal(ObjectOutput)} 
+     * read is exposed in the {@link Ava#writeExternal(ObjectOutput)}
      * method
      * 
      * @see Externalizable#readExternal(ObjectInput)
@@ -851,9 +851,9 @@ public class AVA implements Cloneable, C
     
     
     /**
-     * A String representation of a AVA.
+     * A String representation of a Ava.
      *
-     * @return A string representing a AVA
+     * @return A string representing a Ava
      */
     public String toString()
     {

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/Ava.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AvaSerializer.java (from r1062292, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AvaSerializer.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AvaSerializer.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java&r1=1062292&r2=1062306&rev=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AVASerializer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AvaSerializer.java Sun Jan 23 01:17:06 2011
@@ -37,16 +37,16 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public final class AVASerializer
+public final class AvaSerializer
 {
     /** The LoggerFactory used by this class */
-    protected static final Logger LOG = LoggerFactory.getLogger( AVASerializer.class );
+    protected static final Logger LOG = LoggerFactory.getLogger( AvaSerializer.class );
 
 
     /**
      * Private constructor.
      */
-    private AVASerializer()
+    private AvaSerializer()
     {
     }
 
@@ -58,7 +58,7 @@ public final class AVASerializer
      * The data are stored following the structure :
      * 
      * <li>upName</li> The User provided ATAV
-     * <li>start</li> The position of this ATAV in the DN
+     * <li>start</li> The position of this ATAV in the Dn
      * <li>length</li> The ATAV length
      * <li>upType</li> The user Provided Type
      * <li>normType</li> The normalized AttributeType
@@ -78,7 +78,7 @@ public final class AVASerializer
      * @param out the OutputStream in which the atav will be serialized
      * @throws IOException If we can't serialize the atav
      */
-    public static void serialize( AVA atav, ObjectOutput out ) throws IOException
+    public static void serialize( Ava atav, ObjectOutput out ) throws IOException
     {
         if ( Strings.isEmpty(atav.getUpName())
             || Strings.isEmpty(atav.getUpType())
@@ -152,14 +152,14 @@ public final class AVASerializer
      * Deserialize an AttributeTypeAndValue object
      * 
      * We read back the data to create a new ATAV. The structure 
-     * read is exposed in the {@link AVA#writeExternal(ObjectOutput)} 
+     * read is exposed in the {@link Ava#writeExternal(ObjectOutput)}
      * method<p>
      * 
      * @param in the input stream
      * @throws IOException If the input stream can't be read
      * @return The constructed AttributeTypeAndValue
      */
-    public static AVA deserialize( ObjectInput in ) throws IOException
+    public static Ava deserialize( ObjectInput in ) throws IOException
     {
         String upName = Unicode.readUTF(in);
         in.readInt(); // start
@@ -176,8 +176,8 @@ public final class AVASerializer
                 Value<String> upValue = new StringValue( Unicode.readUTF(in) );
                 Value<String> normValue = new StringValue( Unicode.readUTF(in) );
                 
-                AVA atav = 
-                    new AVA( upType, normType, upValue, normValue, upName );
+                Ava atav =
+                    new Ava( upType, normType, upValue, normValue, upName );
                 
                 return atav;
             }
@@ -191,8 +191,8 @@ public final class AVASerializer
                 byte[] normValue = new byte[valueLength];
                 in.readFully( normValue );
     
-                AVA atav = 
-                    new AVA( upType, normType, 
+                Ava atav =
+                    new Ava( upType, normType,
                         new BinaryValue( upValue) , 
                         new BinaryValue( normValue ), upName );
                 

Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/AvaSerializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * A DN parser that is able to parse complex DNs. This is an Antlr based parser.
+ * A Dn parser that is able to parse complex DNs. This is an Antlr based parser.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -36,14 +36,14 @@ public class ComplexDnParser
 {
 
     /**
-     * Parses an DN.
+     * Parses an Dn.
      * 
      * @param name the string representation of the distinguished name
      * @param rdns the (empty) list where parsed RDNs are put to
      * 
      * @throws LdapInvalidDnException the invalid name exception
      */
-    public void parseDn( String name, List<RDN> rdns ) throws LdapInvalidDnException
+    public void parseDn( String name, List<Rdn> rdns ) throws LdapInvalidDnException
     {
         AntlrDnParser dnParser = new AntlrDnParser( new AntlrDnLexer( new StringReader( name ) ) );
         
@@ -61,14 +61,14 @@ public class ComplexDnParser
 
 
     /**
-     * Parses an RDN.
+     * Parses an Rdn.
      * 
      * @param name the string representationof the relative distinguished name
-     * @param rdn the (empty) RDN where parsed ATAVs are put to
+     * @param rdn the (empty) Rdn where parsed ATAVs are put to
      * 
      * @throws LdapInvalidDnException the invalid name exception
      */
-    public void parseRdn( String name, RDN rdn ) throws LdapInvalidDnException
+    public void parseRdn( String name, Rdn rdn ) throws LdapInvalidDnException
     {
         AntlrDnParser dnParser = new AntlrDnParser( new AntlrDnLexer( new StringReader( name ) ) );
         try



Mime
View raw message