You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/23 02:17:26 UTC

svn commit: r1062306 [17/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...

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sun Jan 23 01:17:06 2011
@@ -72,7 +72,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.util.Strings;
@@ -408,9 +408,9 @@ public class PartitionFrame extends JFra
 
 
     /**
-     * Gets the DN of the DIT node selected in the tree view.
+     * Gets the Dn of the DIT node selected in the tree view.
      * 
-     * @return the DN of the selected tree node or the root Dn of the tree if 
+     * @return the Dn of the selected tree node or the root Dn of the tree if
      * nothing has been selected yet.
      * @throws NamingException on partition access errors
      */
@@ -466,7 +466,7 @@ public class PartitionFrame extends JFra
             {
                 String updn = entry.getDn().getName();
 
-                DN ndn = new DN( Strings.deepTrimToLower( updn ) );
+                Dn ndn = new Dn( Strings.deepTrimToLower( updn ) );
 
                 Entry attrs = new DefaultEntry( schemaManager, entry.getEntry() );
 
@@ -654,7 +654,7 @@ public class PartitionFrame extends JFra
             limitMax = Integer.parseInt( limit );
         }
 
-        IndexCursor<Long, Entry, Long> cursor = partition.getSearchEngine().cursor( new DN( base ),
+        IndexCursor<Long, Entry, Long> cursor = partition.getSearchEngine().cursor( new Dn( base ),
             AliasDerefMode.DEREF_ALWAYS, root, ctls );
         String[] cols = new String[2];
         cols[0] = "id";

Modified: directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Sun Jan 23 01:17:06 2011
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.message.SearchResultReference;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -116,7 +116,7 @@ public class Dsmlv2Engine
      * 
      * @param host the server host
      * @param port the server port
-     * @param user the server admin DN
+     * @param user the server admin Dn
      * @param password the server admin's password
      */
     public Dsmlv2Engine( String host, int port, String user, String password )
@@ -476,7 +476,7 @@ public class Dsmlv2Engine
         BindRequest bindRequest = new BindRequestImpl();
         bindRequest.setSimple( true );
         bindRequest.setCredentials( Strings.getBytesUtf8(password) );
-        bindRequest.setName( new DN( user ) );
+        bindRequest.setName( new Dn( user ) );
         bindRequest.setVersion3( true );
         bindRequest.setMessageId( messageId );
 

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultReference;
 import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
 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.Base64;
 import org.apache.directory.shared.util.Strings;
 import org.xmlpull.v1.XmlPullParser;
@@ -816,7 +816,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -859,7 +859,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -901,7 +901,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -943,7 +943,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -985,7 +985,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -996,9 +996,9 @@ public final class Dsmlv2ResponseGrammar
     };
 
     /**
-     * GrammarAction that creates the Mod DN Response
+     * GrammarAction that creates the Mod Dn Response
      */
-    private final GrammarAction modDNResponseCreation = new GrammarAction( "Create Mod DN Response" )
+    private final GrammarAction modDNResponseCreation = new GrammarAction( "Create Mod Dn Response" )
     {
         public void action( Dsmlv2Container container ) throws XmlPullParserException
         {
@@ -1027,7 +1027,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1074,7 +1074,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    ldapResult.setMatchedDn( new DN( attributeValue ) );
+                    ldapResult.setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1579,7 +1579,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    searchResultEntry.setObjectName( new DN( attributeValue ) );
+                    searchResultEntry.setObjectName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1656,7 +1656,7 @@ public final class Dsmlv2ResponseGrammar
             {
                 try
                 {
-                    searchResultDone.getLdapResult().setMatchedDn( new DN( attributeValue ) );
+                    searchResultDone.getLdapResult().setMatchedDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Message;
 import org.apache.directory.shared.ldap.message.Referral;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.dom4j.Element;
 
 
@@ -77,12 +77,12 @@ public class LdapResultDsml implements D
             root.addAttribute( "requestID", "" + requestID );
         }
 
-        // Matched DN
-        DN matchedDN = result.getMatchedDn();
+        // Matched Dn
+        Dn matchedDn = result.getMatchedDn();
 
-        if ( !DN.isNullOrEmpty( matchedDN ) )
+        if ( !Dn.isNullOrEmpty(matchedDn) )
         {
-            root.addAttribute( "matchedDN", matchedDN.getName() );
+            root.addAttribute( "matchedDn", matchedDn.getName() );
         }
 
         // Controls
@@ -143,7 +143,7 @@ public class LdapResultDsml implements D
 
 
     /**
-     * Get the matched DN
+     * Get the matched Dn
      * 
      * @return Returns the matchedDN.
      */
@@ -154,13 +154,13 @@ public class LdapResultDsml implements D
 
 
     /**
-     * Set the Matched DN
+     * Set the Matched Dn
      * 
-     * @param matchedDN The matchedDN to set.
+     * @param matchedDn The matchedDn to set.
      */
-    public void setMatchedDn( DN matchedDN )
+    public void setMatchedDn( Dn matchedDn)
     {
-        result.setMatchedDn( matchedDN );
+        result.setMatchedDn(matchedDn);
     }
 
 

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
 import org.dom4j.QName;
@@ -114,22 +114,22 @@ public class SearchResultEntryDsml exten
 
 
     /**
-     * Get the entry DN
+     * Get the entry Dn
      * 
      * @return Returns the objectName.
      */
-    public DN getObjectName()
+    public Dn getObjectName()
     {
         return ( ( SearchResultEntry ) instance ).getObjectName();
     }
 
 
     /**
-     * Set the entry DN
+     * Set the entry Dn
      * 
      * @param objectName The objectName to set.
      */
-    public void setObjectName( DN objectName )
+    public void setObjectName( Dn objectName )
     {
         ( ( SearchResultEntry ) instance ).setObjectName( objectName );
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AddRequest;
 import org.apache.directory.shared.ldap.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
 import org.dom4j.QName;
@@ -80,7 +80,7 @@ public class AddRequestDsml extends Abst
 
         AddRequest request = ( AddRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getEntry() != null )
         {
             element.addAttribute( "dn", request.getEntry().getDn().getName() );
@@ -176,22 +176,22 @@ public class AddRequestDsml extends Abst
 
 
     /**
-     * Get the added DN
+     * Get the added Dn
      * 
-     * @return Returns the entry DN.
+     * @return Returns the entry Dn.
      */
-    public DN getEntryDn()
+    public Dn getEntryDn()
     {
         return ( ( AddRequest ) instance ).getEntryDn();
     }
 
 
     /**
-     * Set the added DN.
+     * Set the added Dn.
      * 
-     * @param entryDn The entry DN to set.
+     * @param entryDn The entry Dn to set.
      */
-    public void setEntryDn( DN entryDn )
+    public void setEntryDn( Dn entryDn )
     {
         ( ( AddRequest ) instance ).setEntryDn( entryDn );
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.dsml
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.CompareRequest;
 import org.apache.directory.shared.ldap.message.CompareRequestImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.dom4j.Element;
 
 
@@ -73,7 +73,7 @@ public class CompareRequestDsml extends 
 
         CompareRequest request = ( CompareRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getName() != null )
         {
             element.addAttribute( "dn", request.getName().getName() );
@@ -99,7 +99,7 @@ public class CompareRequestDsml extends 
      * 
      * @return Returns the entry.
      */
-    public DN getName()
+    public Dn getName()
     {
         return ( ( CompareRequest ) instance ).getName();
     }
@@ -110,7 +110,7 @@ public class CompareRequestDsml extends 
      * 
      * @param entry The entry to set.
      */
-    public void setName( DN entry )
+    public void setName( Dn entry )
     {
         ( ( CompareRequest ) instance ).setName( entry );
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.dsml
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.DeleteRequest;
 import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.dom4j.Element;
 
 
@@ -73,7 +73,7 @@ public class DelRequestDsml extends Abst
 
         DeleteRequest request = ( DeleteRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getName() != null )
         {
             element.addAttribute( "dn", request.getName().getName() );
@@ -88,7 +88,7 @@ public class DelRequestDsml extends Abst
      * 
      * @return Returns the entry.
      */
-    public DN getEntry()
+    public Dn getEntry()
     {
         return ( ( DeleteRequest ) instance ).getName();
     }
@@ -99,7 +99,7 @@ public class DelRequestDsml extends Abst
      * 
      * @param entry The entry to set.
      */
-    public void setEntry( DN entry )
+    public void setEntry( Dn entry )
     {
         ( ( DeleteRequest ) instance ).setName( entry );
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Sun Jan 23 01:17:06 2011
@@ -76,8 +76,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
-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;
 import org.apache.directory.shared.util.Base64;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -184,7 +184,7 @@ public final class Dsmlv2Grammar extends
             new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_LOOP, Dsmlv2StatesEnum.EXTENDED_REQUEST_START_TAG,
                 extendedRequestCreation ) );
 
-        // ** MOD DN REQUEST **
+        // ** MOD Dn REQUEST **
         // state: [BATCHREQUEST_START_TAG] - Tag: <modDNRequest>
         super.transitions[Dsmlv2StatesEnum.BATCHREQUEST_START_TAG.ordinal()].put( new Tag( "modDNRequest", Tag.START ),
             new GrammarTransition( Dsmlv2StatesEnum.BATCHREQUEST_START_TAG,
@@ -550,7 +550,7 @@ public final class Dsmlv2Grammar extends
             Dsmlv2StatesEnum.BATCHREQUEST_LOOP, null ) );
 
         //====================================================
-        //  Transitions concerning : MODIFY DN REQUEST
+        //  Transitions concerning : MODIFY Dn REQUEST
         //====================================================
         super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_START_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
         super.transitions[Dsmlv2StatesEnum.MODIFY_DN_REQUEST_CONTROL_START_TAG.ordinal()] = new HashMap<Tag, GrammarTransition>();
@@ -1210,7 +1210,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    addRequest.setEntryDn( new DN( attributeValue ) );
+                    addRequest.setEntryDn( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1331,7 +1331,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    authRequest.setName( new DN( attributeValue ) );
+                    authRequest.setName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1381,7 +1381,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    compareRequest.setName( new DN( attributeValue ) );
+                    compareRequest.setName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1497,7 +1497,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    delRequest.setName( new DN( attributeValue ) );
+                    delRequest.setName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1621,9 +1621,9 @@ public final class Dsmlv2Grammar extends
     };
 
     /**
-     * GrammarAction that creates a Modify DN Request
+     * GrammarAction that creates a Modify Dn Request
      */
-    private final GrammarAction modDNRequestCreation = new GrammarAction( "Create Modify DN Request" )
+    private final GrammarAction modDNRequestCreation = new GrammarAction( "Create Modify Dn Request" )
     {
         public void action( Dsmlv2Container container ) throws XmlPullParserException
         {
@@ -1656,7 +1656,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    modifyDNRequest.setName( new DN( attributeValue ) );
+                    modifyDNRequest.setName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1675,7 +1675,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    modifyDNRequest.setNewRdn( new RDN( attributeValue ) );
+                    modifyDNRequest.setNewRdn( new Rdn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1717,7 +1717,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    modifyDNRequest.setNewSuperior( new DN( attributeValue ) );
+                    modifyDNRequest.setNewSuperior( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1763,7 +1763,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    modifyRequest.setName( new DN( attributeValue ) );
+                    modifyRequest.setName( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {
@@ -1905,7 +1905,7 @@ public final class Dsmlv2Grammar extends
             {
                 try
                 {
-                    searchRequest.setBase( new DN( attributeValue ) );
+                    searchRequest.setBase( new Dn( attributeValue ) );
                 }
                 catch ( LdapInvalidDnException e )
                 {

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.dsml
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
-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;
 import org.dom4j.Element;
 
 
@@ -74,7 +74,7 @@ public class ModifyDNRequestDsml extends
 
         ModifyDnRequest request = ( ModifyDnRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getName() != null )
         {
             element.addAttribute( "dn", request.getName().getName() );
@@ -100,29 +100,29 @@ public class ModifyDNRequestDsml extends
 
 
     /**
-     * Get the modification's DN
+     * Get the modification's Dn
      * 
      * @return Returns the name.
      */
-    public DN getName()
+    public Dn getName()
     {
         return ( ( ModifyDnRequest ) instance ).getName();
     }
 
 
     /**
-     * Set the modification DN.
+     * Set the modification Dn.
      * 
      * @param name The name to set.
      */
-    public void setEntry( DN name )
+    public void setEntry( Dn name )
     {
         ( ( ModifyDnRequest ) instance ).setName( name );
     }
 
 
     /**
-     * Tells if the old RDN is to be deleted
+     * Tells if the old Rdn is to be deleted
      * 
      * @return Returns the deleteOldRDN.
      */
@@ -133,7 +133,7 @@ public class ModifyDNRequestDsml extends
 
 
     /**
-     * Set the flag to delete the old RDN
+     * Set the flag to delete the old Rdn
      * 
      * @param deleteOldRDN The deleteOldRDN to set.
      */
@@ -144,24 +144,24 @@ public class ModifyDNRequestDsml extends
 
 
     /**
-     * Get the new RDN
+     * Get the new Rdn
      * 
      * @return Returns the newRDN.
      */
-    public RDN getNewRDN()
+    public Rdn getNewRDN()
     {
         return ( ( ModifyDnRequest ) instance ).getNewRdn();
     }
 
 
     /**
-     * Set the new RDN
+     * Set the new Rdn
      * 
-     * @param newRDN The newRDN to set.
+     * @param newRdn The newRdn to set.
      */
-    public void setNewRDN( RDN newRDN )
+    public void setNewRDN( Rdn newRdn)
     {
-        ( ( ModifyDnRequest ) instance ).setNewRdn( newRDN );
+        ( ( ModifyDnRequest ) instance ).setNewRdn(newRdn);
     }
 
 
@@ -170,7 +170,7 @@ public class ModifyDNRequestDsml extends
      * 
      * @return Returns the newSuperior.
      */
-    public DN getNewSuperior()
+    public Dn getNewSuperior()
     {
         return ( ( ModifyDnRequest ) instance ).getNewSuperior();
     }
@@ -181,7 +181,7 @@ public class ModifyDNRequestDsml extends
      * 
      * @param newSuperior The newSuperior to set.
      */
-    public void setNewSuperior( DN newSuperior )
+    public void setNewSuperior( Dn newSuperior )
     {
         ( ( ModifyDnRequest ) instance ).setNewSuperior( newSuperior );
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -81,7 +81,7 @@ public class ModifyRequestDsml extends A
 
         ModifyRequest request = ( ModifyRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getName() != null )
         {
             element.addAttribute( "dn", request.getName().getName() );

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Sun Jan 23 01:17:06 2011
@@ -90,7 +90,7 @@ public class SearchRequestDsml extends A
 
         SearchRequest request = ( SearchRequest ) instance;
 
-        // DN
+        // Dn
         if ( request.getBase() != null )
         {
             element.addAttribute( "dn", request.getBase().getName() );

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Sun Jan 23 01:17:06 2011
@@ -501,7 +501,7 @@ public class AddResponseTest extends Abs
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Sun Jan 23 01:17:06 2011
@@ -524,7 +524,7 @@ public class AuthResponseTest extends Ab
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Sun Jan 23 01:17:06 2011
@@ -525,7 +525,7 @@ public class CompareResponseTest extends
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Sun Jan 23 01:17:06 2011
@@ -522,7 +522,7 @@ public class DelResponseTest extends Abs
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Sun Jan 23 01:17:06 2011
@@ -527,7 +527,7 @@ public class ExtendedResponseTest extend
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Sun Jan 23 01:17:06 2011
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
 
 
 /**
- * Tests for the Modify DN Request parsing
+ * Tests for the Modify Dn Request parsing
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.junit.runner.RunWith;
 
 
 /**
- * Tests for the Modify DN Response parsing
+ * Tests for the Modify Dn Response parsing
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -525,7 +525,7 @@ public class ModifyDNResponseTest extend
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Sun Jan 23 01:17:06 2011
@@ -525,7 +525,7 @@ public class ModifyResponseTest extends 
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Sun Jan 23 01:17:06 2011
@@ -538,7 +538,7 @@ public class SearchResultDoneTest extend
 
 
     /**
-     * Test parsing of a response with wrong matched DN
+     * Test parsing of a response with wrong matched Dn
      */
     @Test
     public void testResponseWithWrongMatchedDN()

Modified: directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties (original)
+++ directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Sun Jan 23 01:17:06 2011
@@ -213,7 +213,7 @@ ERR_04087=Error while injecting the Attr
 ERR_04088=The AddResponse must not be null
 ERR_04089=The entry must not be null
 ERR_04090=The newrdn must not be null
-ERR_04091=The oldRDN flag {0} is invalid : {1}. It should be 0 or 255
+ERR_04091=The oldRdn flag {0} is invalid : {1}. It should be 0 or 255
 ERR_04092=The new superior must not be null if the flag 'delete old DN' is set to true
 ERR_04093=The attribute description must not be null
 ERR_04094=The CompareResponse must not be null
@@ -233,7 +233,7 @@ ERR_04107=The substrings sequence is emp
 ERR_04108=The substring initial filter is empty
 ERR_04109=The matching rule is empty
 ERR_04110=The DN attributes flag {0} is invalid : {1}. It should be 0 or 255
-ERR_04111=Could not parse matchedDN while transforming Codec value to Internal: {0}
+ERR_04111=Could not parse matchedDn while transforming Codec value to Internal: {0}
 ERR_04112=Error while transforming a ExprNode : {0}
 ERR_04113=shouldn't happen - if it does then we have issues
 ERR_04114=The CSN must not be null or empty

Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import java.util.List;
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
@@ -200,22 +200,22 @@ public class SubtreeSpecificationParserT
         SubtreeSpecification ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new DN( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new DN( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new Dn( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new Dn( "ef=gh" ) ) );
 
         // try a second time
         ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new DN( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new DN( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new Dn( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new Dn( "ef=gh" ) ) );
 
         // try a third time
         ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
         assertFalse( ss.getChopBeforeExclusions().isEmpty() );
         assertFalse( ss.getChopAfterExclusions().isEmpty() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new DN( "ab=cd" ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new DN( "ef=gh" ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new Dn( "ab=cd" ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new Dn( "ef=gh" ) ) );
     }
 
 
@@ -264,7 +264,7 @@ public class SubtreeSpecificationParserT
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_MINIMUM_AND_MAXIMUM );
 
-        assertEquals( new DN( "ou=ORGANIZATION UNIT" ).getName(), ss.getBase().getName() );
+        assertEquals( new Dn( "ou=ORGANIZATION UNIT" ).getName(), ss.getBase().getName() );
         assertEquals( 1, ss.getMinBaseDistance() );
         assertEquals( 2, ss.getMaxBaseDistance() );
     }
@@ -281,10 +281,10 @@ public class SubtreeSpecificationParserT
         assertNotNull( ss );
 
         assertEquals( "ou=people", ss.getBase().toString() );
-        assertTrue( ss.getChopBeforeExclusions().contains( new DN( "x=y" ).normalize( schemaManager ) ) );
-        assertTrue( ss.getChopBeforeExclusions().contains( new DN( "y=z" ).normalize( schemaManager ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new DN( "k=l" ).normalize( schemaManager ) ) );
-        assertTrue( ss.getChopAfterExclusions().contains( new DN( "l=m" ).normalize( schemaManager ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new Dn( "x=y" ).normalize( schemaManager ) ) );
+        assertTrue( ss.getChopBeforeExclusions().contains( new Dn( "y=z" ).normalize( schemaManager ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new Dn( "k=l" ).normalize( schemaManager ) ) );
+        assertTrue( ss.getChopAfterExclusions().contains( new Dn( "l=m" ).normalize( schemaManager ) ) );
         assertEquals( 7, ss.getMinBaseDistance() );
         assertEquals( 77, ss.getMaxBaseDistance() );
     }
@@ -396,17 +396,17 @@ public class SubtreeSpecificationParserT
     @Test
     public void testReusabiltiy() throws Exception
     {
-        DN firstDN = new DN("k=l");
+        Dn firstDn = new Dn("k=l");
         String firstExclusion = "{ specificExclusions { chopAfter:\"k=l\" } }";
         SubtreeSpecification firstSpec = parser.parse( firstExclusion );
         assertEquals( 1, firstSpec.getChopAfterExclusions().size() );
-        assertEquals( firstDN, firstSpec.getChopAfterExclusions().iterator().next() );
+        assertEquals(firstDn, firstSpec.getChopAfterExclusions().iterator().next() );
 
-        DN secondDN = new DN("x=y");
+        Dn secondDn = new Dn("x=y");
         String secondExclusion = "{ specificExclusions { chopAfter:\"x=y\" } }";
         SubtreeSpecification secondSpec = parser.parse( secondExclusion );
         assertEquals( 1, secondSpec.getChopAfterExclusions().size() );
-        assertEquals( secondDN, secondSpec.getChopAfterExclusions().iterator().next() );
+        assertEquals(secondDn, secondSpec.getChopAfterExclusions().iterator().next() );
 
     }
 

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapAsyncConnection.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.message.ModifyRequest;
 import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -86,7 +86,7 @@ public interface LdapAsyncConnection ext
     /**
      * Simple asynchronous Bind on a server.
      *
-     * @param name The name we use to authenticate the user, it must be a valid DN
+     * @param name The name we use to authenticate the user, it must be a valid Dn
      * @param credentials The password, it can't be null 
      * @return the bind operation's future
      * @throws LdapException if some error occurred
@@ -98,13 +98,13 @@ public interface LdapAsyncConnection ext
     /**
      * Simple asynchronous Bind on a server.
      *
-     * @param name The name we use to authenticate the user, it must be a valid DN
+     * @param name The name we use to authenticate the user, it must be a valid Dn
      * @param credentials The password, it can't be null
      * @return the bind operation's future
      * @throws LdapException if some error occurred
      * @throws IOException if some IO error occurred
      */
-    BindFuture bindAsync( DN name, String credentials ) throws LdapException, IOException;
+    BindFuture bindAsync( Dn name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -131,7 +131,7 @@ public interface LdapAsyncConnection ext
      * This method is blocking.
      * </pre>
      * 
-     * @param baseDn The base for the search, it must be a valid DN, and can't be emtpy
+     * @param baseDn The base for the search, it must be a valid Dn, and can't be emtpy
      * @param filter The filter to use for this search, it can't be empty
      * @param scope The search scope : OBJECT, ONELEVEL or SUBTREE 
      * @param attributes The attributes for this search 
@@ -155,14 +155,14 @@ public interface LdapAsyncConnection ext
      * This method is blocking.
      * </pre>
      * 
-     * @param baseDn The base for the search, it must be a valid DN, and can't be empty
+     * @param baseDn The base for the search, it must be a valid Dn, and can't be empty
      * @param filter The filter to use for this search, it can't be empty
      * @param scope The search scope : OBJECT, ONELEVEL or SUBTREE
      * @param attributes The attributes for this search 
      * @return the search operation's future
      * @throws LdapException if some error occurred
      */
-    SearchFuture searchAsync( DN baseDn, String filter, SearchScope scope, String... attributes )
+    SearchFuture searchAsync( Dn baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException;
 
 
@@ -212,7 +212,7 @@ public interface LdapAsyncConnection ext
      *  
      * @param delRequest the delete operation's request
      * @return delete operation's future
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
     DeleteFuture deleteAsync( DeleteRequest delRequest ) throws LdapException;
 
@@ -220,7 +220,7 @@ public interface LdapAsyncConnection ext
     /**
      * Asynchronously compares an entry's attribute's value with that of the given value
      *   
-     * @param compareRequest the CompareRequest which contains the target DN, attribute name and value
+     * @param compareRequest the CompareRequest which contains the target Dn, attribute name and value
      * @return compare operation's future
      * @throws LdapException if some error occurred
      */

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Sun Jan 23 01:17:06 2011
@@ -48,8 +48,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyResponse;
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.control.Control;
-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;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -154,7 +154,7 @@ public interface LdapConnection
      * Simple Bind on a server.
      *
      * @param name The name we use to authenticate the user. It must be a
-     * valid DN
+     * valid Dn
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      * @throws LdapException if some error occurred
@@ -167,13 +167,13 @@ public interface LdapConnection
      * Simple Bind on a server.
      *
      * @param name The name we use to authenticate the user. It must be a
-     * valid DN
+     * valid Dn
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      * @throws LdapException if some error occurred
      * @throws IOException if an I/O exception occurred
      */
-    BindResponse bind( DN name, String credentials ) throws LdapException, IOException;
+    BindResponse bind( Dn name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -200,14 +200,14 @@ public interface LdapConnection
      * This method is blocking.
      *
      * @param baseDn The base for the search. It must be a valid
-     * DN, and can't be emtpy
+     * Dn, and can't be emtpy
      * @param filter The filter to use for this search. It can't be empty
      * @param scope The search scope : OBJECT, ONELEVEL or SUBTREE
      * @param attributes The attributes to use for this search
      * @return A search cursor on the result.
      * @throws LdapException if some error occurred
      */
-    SearchCursor search( DN baseDn, String filter, SearchScope scope, String... attributes )
+    SearchCursor search( Dn baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException;
 
 
@@ -223,7 +223,7 @@ public interface LdapConnection
      * This method is blocking.
      *
      * @param baseDn The base for the search. It must be a valid
-     * DN, and can't be emtpy
+     * Dn, and can't be emtpy
      * @param filter The filter to use for this search. It can't be empty
      * @param scope The search scope : OBJECT, ONELEVEL or SUBTREE
      * @param attributes The attributes to use for this search
@@ -264,20 +264,20 @@ public interface LdapConnection
 
 
     /**
-     * Applies all the modifications to the entry specified by its DN.
+     * Applies all the modifications to the entry specified by its Dn.
      *
-     * @param dn The entry's DN
+     * @param dn The entry's Dn
      * @param modifications The list of modifications to be applied
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException;
+    ModifyResponse modify( Dn dn, Modification... modifications ) throws LdapException;
 
 
     /**
-     * Applies all the modifications to the entry specified by its DN.
+     * Applies all the modifications to the entry specified by its Dn.
      *
-     * @param dn The entry's DN
+     * @param dn The entry's Dn
      * @param modifications The list of modifications to be applied
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
@@ -308,10 +308,10 @@ public interface LdapConnection
 
 
     /**
-     * Renames the given entryDn with new RDN and deletes the old RDN.
+     * Renames the given entryDn with new Rdn and deletes the old Rdn.
      *
-     * @param entryDn the target DN
-     * @param newRdn new RDN for the target DN
+     * @param entryDn the target Dn
+     * @param newRdn new Rdn for the target Dn
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
      * @see #rename(String, String, boolean)
@@ -320,109 +320,109 @@ public interface LdapConnection
 
 
     /**
-     * Renames the given entryDn with new RDN and deletes the old RDN.
+     * Renames the given entryDn with new Rdn and deletes the old Rdn.
      *
-     * @param entryDn the target DN
-     * @param newRdn new RDN for the target DN
+     * @param entryDn the target Dn
+     * @param newRdn new Rdn for the target Dn
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
-     * @see #rename(DN, RDN, boolean)
+     * @see #rename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Rdn, boolean)
      */
-    ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException;
+    ModifyDnResponse rename( Dn entryDn, Rdn newRdn ) throws LdapException;
 
 
     /**
-     * Renames the given entryDn with new RDN and deletes the old RDN if
+     * Renames the given entryDn with new Rdn and deletes the old Rdn if
      * deleteOldRdn is set to true.
      *
-     * @param entryDn the target DN
-     * @param newRdn new RDN for the target DN
-     * @param deleteOldRdn flag to indicate whether to delete the old RDN
+     * @param entryDn the target Dn
+     * @param newRdn new Rdn for the target Dn
+     * @param deleteOldRdn flag to indicate whether to delete the old Rdn
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
-     * @see #rename(DN, RDN, boolean)
+     * @see #rename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Rdn, boolean)
      */
     ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException;
 
 
     /**
-     * Renames the given entryDn with new RDN and deletes the old RDN if
+     * Renames the given entryDn with new Rdn and deletes the old Rdn if
      * deleteOldRdn is set to true.
      *
-     * @param entryDn the target DN
-     * @param newRdn new RDN for the target DN
-     * @param deleteOldRdn flag to indicate whether to delete the old RDN
+     * @param entryDn the target Dn
+     * @param newRdn new Rdn for the target Dn
+     * @param deleteOldRdn flag to indicate whether to delete the old Rdn
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
      */
-    ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException;
+    ModifyDnResponse rename( Dn entryDn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException;
 
 
     /**
-     * Moves the given entry DN under the new superior DN.
+     * Moves the given entry Dn under the new superior Dn.
      *
-     * @param entryDn the DN of the target entry
-     * @param newSuperiorDn DN of the new parent/superior
+     * @param entryDn the Dn of the target entry
+     * @param newSuperiorDn Dn of the new parent/superior
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
-     * @see #move(DN, DN)
+     * @see #move(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn)
      */
     ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException;
 
 
     /**
-     * Moves the given entry DN under the new superior DN.
+     * Moves the given entry Dn under the new superior Dn.
      *
-     * @param entryDn the DN of the target entry
-     * @param newSuperiorDn DN of the new parent/superior
+     * @param entryDn the Dn of the target entry
+     * @param newSuperiorDn Dn of the new parent/superior
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
      */
-    ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException;
+    ModifyDnResponse move( Dn entryDn, Dn newSuperiorDn ) throws LdapException;
 
 
     /**
-     * Moves and renames the given entryDn. The old RDN will be deleted.
+     * Moves and renames the given entryDn. The old Rdn will be deleted.
      *
-     * @param entryDn The original entry DN
-     * @param newDn The new Entry DN
+     * @param entryDn The original entry Dn
+     * @param newDn The new Entry Dn
      * @return modifyDn operations response
      * @throws LdapException if some error occurred
-     * @see #moveAndRename(DN, DN, boolean)
+     * @see #moveAndRename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, boolean)
      */
-    ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException;
+    ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn ) throws LdapException;
 
 
     /**
-     * Moves and renames the given entryDn.The old RDN will be deleted
+     * Moves and renames the given entryDn.The old Rdn will be deleted
      *
-     * @param entryDn The original entry DN
-     * @param newDn The new Entry DN
+     * @param entryDn The original entry Dn
+     * @param newDn The new Entry Dn
      * @return modifyDn operations response
      * @throws LdapException if some error occurred
-     * @see #moveAndRename(DN, DN, boolean)
+     * @see #moveAndRename(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, boolean)
      */
     ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException;
 
 
     /**
-     * Moves and renames the given entryDn. The old RDN will be deleted if requested.
+     * Moves and renames the given entryDn. The old Rdn will be deleted if requested.
      *
-     * @param entryDn The original entry DN
-     * @param newDn The new Entry DN
-     * @param deleteOldRdn Tells if the old RDN must be removed
+     * @param entryDn The original entry Dn
+     * @param newDn The new Entry Dn
+     * @param deleteOldRdn Tells if the old Rdn must be removed
      * @return modifyDn operations response
      * @throws LdapException if some error occurred
      */
-    ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException;
+    ModifyDnResponse moveAndRename( Dn entryDn, Dn newDn, boolean deleteOldRdn ) throws LdapException;
 
 
     /**
-     * Moves and renames the given entryDn. The old RDN will be deleted if requested.
+     * Moves and renames the given entryDn. The old Rdn will be deleted if requested.
      *
-     * @param entryDn The original entry DN
-     * @param newDn The new Entry DN
-     * @param deleteOldRdn Tells if the old RDN must be removed
+     * @param entryDn The original entry Dn
+     * @param newDn The new Entry Dn
+     * @param deleteOldRdn Tells if the old Rdn must be removed
      * @return modifyDn operation's response
      * @throws LdapException if some error occurred
      */
@@ -441,23 +441,23 @@ public interface LdapConnection
 
 
     /**
-     * Deletes the entry with the given DN.
+     * Deletes the entry with the given Dn.
      *
-     * @param dn the target entry's DN as a String
+     * @param dn the target entry's Dn as a String
      * @return the delete operation's response
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
     DeleteResponse delete( String dn ) throws LdapException;
 
 
     /**
-     * Deletes the entry with the given DN.
+     * Deletes the entry with the given Dn.
      *
-     * @param dn the target entry's DN
+     * @param dn the target entry's Dn
      * @return the delete operation's response
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
-    DeleteResponse delete( DN dn ) throws LdapException;
+    DeleteResponse delete( Dn dn ) throws LdapException;
 
 
     /**
@@ -465,16 +465,16 @@ public interface LdapConnection
      *
      * @param deleteRequest the delete operation's request
      * @return delete operation's response, null if a non-null listener value is provided
-     * @throws LdapException If the DN is not valid or if the deletion failed
+     * @throws LdapException If the Dn is not valid or if the deletion failed
      */
     DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
 
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's String DN
+     * @param dn the target entry's String Dn
      * @param attributeName the attribute's name
      * @param value a String value with which the target entry's attribute value to be compared with
      * @return compare operation's response
@@ -485,9 +485,9 @@ public interface LdapConnection
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's String DN
+     * @param dn the target entry's String Dn
      * @param attributeName the attribute's name
      * @param value a byte[] value with which the target entry's attribute value to be compared with
      * @return compare operation's response
@@ -498,9 +498,9 @@ public interface LdapConnection
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's String DN
+     * @param dn the target entry's String Dn
      * @param attributeName the attribute's name
      * @param value a Value<?> value with which the target entry's attribute value to be compared with
      * @return compare operation's response
@@ -511,47 +511,47 @@ public interface LdapConnection
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's DN
+     * @param dn the target entry's Dn
      * @param attributeName the attribute's name
      * @param value a String value with which the target entry's attribute value to be compared with
      * @return compare operation's response
      * @throws LdapException if some error occurred
      */
-    CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException;
+    CompareResponse compare( Dn dn, String attributeName, String value ) throws LdapException;
 
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's DN
+     * @param dn the target entry's Dn
      * @param attributeName the attribute's name
      * @param value a byte[] value with which the target entry's attribute value to be compared with
      * @return compare operation's response
      * @throws LdapException if some error occurred
      */
-    CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException;
+    CompareResponse compare( Dn dn, String attributeName, byte[] value ) throws LdapException;
 
 
     /**
      * Compares whether a given attribute's value matches that of the
-     * existing value of the attribute present in the entry with the given DN.
+     * existing value of the attribute present in the entry with the given Dn.
      *
-     * @param dn the target entry's DN
+     * @param dn the target entry's Dn
      * @param attributeName the attribute's name
      * @param value a Value<?> value with which the target entry's attribute value to be compared with
      * @return compare operation's response
      * @throws LdapException if some error occurred
      */
-    CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException;
+    CompareResponse compare( Dn dn, String attributeName, Value<?> value ) throws LdapException;
 
 
     /**
      * Compares an entry's attribute's value with that of the given value.
      *
-     * @param compareRequest the CompareRequest which contains the target DN, attribute name and value
+     * @param compareRequest the CompareRequest which contains the target Dn, attribute name and value
      * @return compare operation's response
      * @throws LdapException if some error occurred
      */
@@ -608,7 +608,7 @@ public interface LdapConnection
      *
      * @param extendedRequest the extended operation's request
      * @return Extended operation's response
-     * @throws LdapException If the DN is not valid or if the extended operation failed
+     * @throws LdapException If the Dn is not valid or if the extended operation failed
      */
     ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
 
@@ -616,7 +616,7 @@ public interface LdapConnection
     /**
      * Tells if an Entry exists in the server.
      * 
-     * @param dn The DN for the entry we want to check the existence
+     * @param dn The Dn for the entry we want to check the existence
      * @return <code>true</code> if the entry exists, <code>false</code> otherwise. 
      * Note that if the entry exists but if the user does not have the permission to
      * read it, <code>false</code> will also be returned 
@@ -628,82 +628,82 @@ public interface LdapConnection
     /**
      * Tells if an Entry exists in the server.
      * 
-     * @param dn The DN for the entry we want to check the existence
+     * @param dn The Dn for the entry we want to check the existence
      * @return <code>true</code> if the entry exists, <code>false</code> otherwise. 
      * Note that if the entry exists but if the user does not have the permission to
      * read it, <code>false</code> will also be returned 
      * @throws LdapException if some error occurred
      */
-    boolean exists( DN dn ) throws LdapException;
+    boolean exists( Dn dn ) throws LdapException;
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
-     * @see #lookup(DN, String...)
+     * @param dn the Dn of the entry to be fetched
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
+     * @see #lookup(org.apache.directory.shared.ldap.name.Dn, String...)
      */
-    Entry lookup( DN dn ) throws LdapException;
+    Entry lookup( Dn dn ) throws LdapException;
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
+     * @param dn the Dn of the entry to be fetched
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
      * @see #lookup(String, String...)
      */
     Entry lookup( String dn ) throws LdapException;
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
+     * @param dn the Dn of the entry to be fetched
      * @param attributes the attributes to be returned along with entry
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
      */
-    Entry lookup( DN dn, String... attributes ) throws LdapException;
+    Entry lookup( Dn dn, String... attributes ) throws LdapException;
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
+     * @param dn the Dn of the entry to be fetched
      * @param controls the controls to use
      * @param attributes the attributes to be returned along with entry
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
      */
-    Entry lookup( DN dn, Control[] controls, String... attributes ) throws LdapException;
+    Entry lookup( Dn dn, Control[] controls, String... attributes ) throws LdapException;
 
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
+     * @param dn the Dn of the entry to be fetched
      * @param attributes the attributes to be returned along with entry
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
-     * @see #lookup(DN, String...)
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
+     * @see #lookup(org.apache.directory.shared.ldap.name.Dn, String...)
      */
     Entry lookup( String dn, String... attributes ) throws LdapException;
 
 
     /**
-     * Searches for an entry having the given DN.
+     * Searches for an entry having the given Dn.
      *
-     * @param dn the DN of the entry to be fetched
+     * @param dn the Dn of the entry to be fetched
      * @param controls the controls to use
      * @param attributes the attributes to be returned along with entry
-     * @return the Entry with the given DN or null if no entry exists with that DN
-     * @throws LdapException in case of any problems while searching for the DN or if the returned response contains a referral
-     * @see #lookup(DN, String...)
+     * @return the Entry with the given Dn or null if no entry exists with that Dn
+     * @throws LdapException in case of any problems while searching for the Dn or if the returned response contains a referral
+     * @see #lookup(org.apache.directory.shared.ldap.name.Dn, String...)
      */
     Entry lookup( String dn, Control[] controls, String... attributes ) throws LdapException;
 

Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java (original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionConfig.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ public class LdapConnectionConfig
     /** the remote LDAP host */
     private String ldapHost;
 
-    /** a valid DN to authenticate the user */
+    /** a valid Dn to authenticate the user */
     private String name;
 
     /** user's credentials ( current implementation supports password only); it must be a non-null value */