directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918756 [2/6] - in /directory/shared/trunk: dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml-parser/src/main/java/org/apache/directory/shared/dsm...
Date Wed, 03 Mar 2010 23:05:32 GMT
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Wed Mar  3 23:05:29 2010
@@ -107,7 +107,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchResponseDoneImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -350,7 +350,7 @@
 
                     // We have to handle the special case of a 0 length matched
                     // DN
-                    LdapDN entry = null;
+                    DN entry = null;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -364,7 +364,7 @@
 
                         try
                         {
-                            entry = new LdapDN( dnStr );
+                            entry = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -374,7 +374,7 @@
 
                             DeleteResponseImpl response = new DeleteResponseImpl( delRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
 
                         delRequest.setEntry( entry );
@@ -579,7 +579,7 @@
                     // We have to handle the special case of a 0 length name
                     if ( tlv.getLength() == 0 )
                     {
-                        bindRequestMessage.setName( LdapDN.EMPTY_LDAPDN );
+                        bindRequestMessage.setName( DN.EMPTY_DN );
                     }
                     else
                     {
@@ -588,7 +588,7 @@
 
                         try
                         {
-                            LdapDN dn = new LdapDN( dnStr );
+                            DN dn = new DN( dnStr );
                             bindRequestMessage.setName( dn );
                         }
                         catch ( InvalidNameException ine )
@@ -600,7 +600,7 @@
                             BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() );
 
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
                     }
 
@@ -1144,7 +1144,7 @@
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    LdapDN objectName = LdapDN.EMPTY_LDAPDN;
+                    DN objectName = DN.EMPTY_DN;
 
                     // Store the value.
                     if ( tlv.getLength() == 0 )
@@ -1158,7 +1158,7 @@
 
                         try
                         {
-                            objectName = new LdapDN( dnStr );
+                            objectName = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -1450,7 +1450,7 @@
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
-                    LdapDN object = LdapDN.EMPTY_LDAPDN;
+                    DN object = DN.EMPTY_DN;
 
                     // Store the value.
                     if ( tlv.getLength() == 0 )
@@ -1464,7 +1464,7 @@
 
                         try
                         {
-                            object = new LdapDN( dnStr );
+                            object = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -1474,7 +1474,7 @@
 
                             ModifyResponseImpl response = new ModifyResponseImpl( modifyRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
 
                         modifyRequest.setObject( object );
@@ -1896,17 +1896,17 @@
                         // I guess that trying to add an entry which DN is empty is a naming violation...
                         // Not 100% sure though ...
                         throw new ResponseCarryingException( msg, response, ResultCodeEnum.NAMING_VIOLATION,
-                            LdapDN.EMPTY_LDAPDN, null );
+                            DN.EMPTY_DN, null );
                     }
                     else
                     {
-                        LdapDN entryDn = null;
+                        DN entryDn = null;
                         byte[] dnBytes = tlv.getValue().getData();
                         String dnStr = StringTools.utf8ToString( dnBytes );
 
                         try
                         {
-                            entryDn = new LdapDN( dnStr );
+                            entryDn = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -1916,7 +1916,7 @@
 
                             AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
 
                         addRequest.setEntryDn( entryDn );
@@ -2197,7 +2197,7 @@
 
                     // We have to handle the special case of a 0 length matched
                     // DN
-                    LdapDN entry = null;
+                    DN entry = null;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -2211,7 +2211,7 @@
 
                         try
                         {
-                            entry = new LdapDN( dnStr );
+                            entry = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -2221,7 +2221,7 @@
 
                             ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDNRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
 
                         modifyDNRequest.setEntry( entry );
@@ -2280,7 +2280,7 @@
 
                         try
                         {
-                            LdapDN dn = new LdapDN( dnStr );
+                            DN dn = new DN( dnStr );
                             newRdn = dn.getRdn( 0 );
                         }
                         catch ( InvalidNameException ine )
@@ -2384,7 +2384,7 @@
 
                     // We have to handle the special case of a 0 length matched
                     // DN
-                    LdapDN newSuperior = LdapDN.EMPTY_LDAPDN;
+                    DN newSuperior = DN.EMPTY_DN;
 
                     if ( tlv.getLength() == 0 )
                     {
@@ -2408,7 +2408,7 @@
 
                         try
                         {
-                            newSuperior = new LdapDN( dnStr );
+                            newSuperior = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -2548,7 +2548,7 @@
 
                     // Get the Value and store it in the CompareRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
-                    LdapDN entry = null;
+                    DN entry = null;
 
                     // We have to handle the special case of a 0 length matched
                     // DN
@@ -2564,7 +2564,7 @@
 
                         try
                         {
-                            entry = new LdapDN( dnStr );
+                            entry = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -2574,7 +2574,7 @@
 
                             CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
 
                         compareRequest.setEntry( entry );
@@ -3646,7 +3646,7 @@
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We have to check that this is a correct DN
-                    LdapDN baseObject = LdapDN.EMPTY_LDAPDN;
+                    DN baseObject = DN.EMPTY_DN;
 
                     // We have to handle the special case of a 0 length base
                     // object,
@@ -3659,7 +3659,7 @@
 
                         try
                         {
-                            baseObject = new LdapDN( dnStr );
+                            baseObject = new DN( dnStr );
                         }
                         catch ( InvalidNameException ine )
                         {
@@ -3669,7 +3669,7 @@
 
                             SearchResponseDoneImpl response = new SearchResponseDoneImpl( searchRequest.getMessageId() );
                             throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
-                                LdapDN.EMPTY_LDAPDN, ine );
+                                DN.EMPTY_DN, ine );
                         }
                     }
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java Wed Mar  3 23:05:29 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -103,7 +103,7 @@
     private ResultCodeEnum resultCode;
 
     /** The DN that is matched by the Bind */
-    private LdapDN matchedDN;
+    private DN matchedDN;
 
     /** Temporary storage of the byte[] representing the matchedDN */
     private byte[] matchedDNBytes;
@@ -182,7 +182,7 @@
      * 
      * @param matchedDN The matchedDN to set.
      */
-    public void setMatchedDN( LdapDN matchedDN )
+    public void setMatchedDN( DN matchedDN )
     {
         this.matchedDN = matchedDN;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java Wed Mar  3 23:05:29 2010
@@ -109,7 +109,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -161,7 +161,7 @@
     {
         AddRequestImpl internalMessage = new AddRequestImpl( messageId );
 
-        // Codec : LdapDN entry -> Internal : String name
+        // Codec : DN entry -> Internal : String name
         internalMessage.setEntry( addRequest.getEntry() );
 
         // Codec : Attributes attributes -> Internal : Attributes entry
@@ -185,7 +185,7 @@
         // Codec : int version -> Internal : boolean isVersion3
         internalMessage.setVersion3( bindRequest.isLdapV3() );
 
-        // Codec : LdapDN name -> Internal : LdapDN name
+        // Codec : DN name -> Internal : DN name
         internalMessage.setName( bindRequest.getName() );
 
         // Codec : Asn1Object authentication instanceOf SimpleAuthentication ->
@@ -245,12 +245,12 @@
         
         try
         {
-            internalLdapResult.setMatchedDn( new LdapDN( codecLdapResult.getMatchedDN() ) );
+            internalLdapResult.setMatchedDn( new DN( codecLdapResult.getMatchedDN() ) );
         }
         catch ( InvalidNameException e )
         {
             LOG.error( I18n.err( I18n.ERR_04111, codecLdapResult.getMatchedDN() ) );
-            internalLdapResult.setMatchedDn( new LdapDN() );
+            internalLdapResult.setMatchedDn( new DN() );
         }
         
         internalLdapResult.setResultCode( codecLdapResult.getResultCode() );
@@ -285,7 +285,7 @@
     {
         CompareRequestImpl internalMessage = new CompareRequestImpl( messageId );
 
-        // Codec : LdapDN entry -> Internal : private LdapDN
+        // Codec : DN entry -> Internal : private DN
         internalMessage.setName( compareRequest.getEntry() );
 
         // Codec : LdapString attributeDesc -> Internal : String attrId
@@ -316,7 +316,7 @@
     {
         DeleteRequestImpl internalMessage = new DeleteRequestImpl( messageId );
 
-        // Codec : LdapDN entry -> Internal : LdapDN
+        // Codec : DN entry -> Internal : DN
         internalMessage.setName( delRequest.getEntry() );
 
         return internalMessage;
@@ -366,16 +366,16 @@
     {
         ModifyDnRequestImpl internalMessage = new ModifyDnRequestImpl( messageId );
 
-        // Codec : LdapDN entry -> Internal : LdapDN m_name
+        // Codec : DN entry -> Internal : DN m_name
         internalMessage.setName( modifyDNRequest.getEntry() );
 
-        // Codec : RelativeLdapDN newRDN -> Internal : LdapDN m_newRdn
+        // Codec : RelativeDN newRDN -> Internal : DN m_newRdn
         internalMessage.setNewRdn( modifyDNRequest.getNewRDN() );
 
         // Codec : boolean deleteOldRDN -> Internal : boolean m_deleteOldRdn
         internalMessage.setDeleteOldRdn( modifyDNRequest.isDeleteOldRDN() );
 
-        // Codec : LdapDN newSuperior -> Internal : LdapDN m_newSuperior
+        // Codec : DN newSuperior -> Internal : DN m_newSuperior
         internalMessage.setNewSuperior( modifyDNRequest.getNewSuperior() );
 
         return internalMessage;
@@ -393,7 +393,7 @@
     {
         ModifyRequestImpl internalMessage = new ModifyRequestImpl( messageId );
 
-        // Codec : LdapDN object -> Internal : String name
+        // Codec : DN object -> Internal : String name
         internalMessage.setName( modifyRequest.getObject() );
 
         // Codec : ArrayList modifications -> Internal : ArrayList mods
@@ -719,7 +719,7 @@
     {
         SearchRequestImpl internalMessage = new SearchRequestImpl( messageId );
 
-        // Codec : LdapDN baseObject -> Internal : String baseDn
+        // Codec : DN baseObject -> Internal : String baseDn
         internalMessage.setBase( searchRequest.getBaseObject() );
 
         // Codec : int scope -> Internal : ScopeEnum scope
@@ -904,7 +904,7 @@
         
         codecLdapResult.setErrorMessage( StringTools.isEmpty( errorMessage ) ? "" : errorMessage );
 
-        // Internal : String matchedDn -> Codec : LdapDN matchedDN
+        // Internal : String matchedDn -> Codec : DN matchedDN
         codecLdapResult.setMatchedDN( internalLdapResult.getMatchedDn() );
 
         // Internal : Referral referral -> Codec : ArrayList referrals
@@ -1188,7 +1188,7 @@
         SearchResponseEntryImpl internalSearchResultResponse = ( SearchResponseEntryImpl ) internalMessage;
         SearchResultEntryCodec searchResultEntry = new SearchResultEntryCodec();
 
-        // Internal : LdapDN dn -> Codec : LdapDN objectName
+        // Internal : DN dn -> Codec : DN objectName
         searchResultEntry.setObjectName( internalSearchResultResponse.getObjectName() );
 
         // Internal : Attributes attributes -> Codec : ArrayList

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java Wed Mar  3 23:05:29 2010
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -65,7 +65,7 @@
      * @param cause The Exception which caused the error
      */
     public ResponseCarryingException(String message, InternalResultResponse response, ResultCodeEnum code, 
-        LdapDN matchedDn, Throwable cause)
+        DN matchedDn, Throwable cause)
     {
         super( message, cause );
 

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java Wed Mar  3 23:05:29 2010
@@ -31,7 +31,7 @@
 import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@
         // DN
         if ( tlv.getLength() == 0 )
         {
-            ldapResult.setMatchedDN( LdapDN.EMPTY_LDAPDN );
+            ldapResult.setMatchedDN( DN.EMPTY_DN );
         }
         else
         {
@@ -92,7 +92,7 @@
                     
                     try
                     {
-                        ldapResult.setMatchedDN( new LdapDN( dnStr ) );
+                        ldapResult.setMatchedDN( new DN( dnStr ) );
                     }
                     catch ( InvalidNameException ine )
                     {
@@ -109,7 +109,7 @@
                     log.warn( "The matched DN should not be set when the result code is one of NoSuchObject," + 
                         " AliasProblem, InvalidDNSyntax or AliasDreferencingProblem" );
 
-                    ldapResult.setMatchedDN( LdapDN.EMPTY_LDAPDN );
+                    ldapResult.setMatchedDN( DN.EMPTY_DN );
                     break;
             }
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/AddRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -218,7 +218,7 @@
      * 
      * @return Returns the entry DN.
      */
-    public LdapDN getEntryDn()
+    public DN getEntryDn()
     {
         return entry.getDn();
     }
@@ -229,7 +229,7 @@
      * 
      * @param entry The DN to set.
      */
-    public void setEntryDn( LdapDN entryDn )
+    public void setEntryDn( DN entryDn )
     {
         entry.setDn( entryDn );
     }
@@ -277,7 +277,7 @@
     protected int computeLengthProtocolOp()
     {
         // The entry
-        addRequestLength = 1 + TLV.getNbBytes( LdapDN.getNbBytes( entry.getDn() ) ) + LdapDN.getNbBytes( entry.getDn() );
+        addRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry.getDn() ) ) + DN.getNbBytes( entry.getDn() );
 
         // The attributes sequence
         attributesLength = 0;
@@ -367,7 +367,7 @@
             buffer.put( TLV.getBytes( addRequestLength ) );
 
             // The entry
-            Value.encode( buffer, LdapDN.getBytes( entry.getDn() ) );
+            Value.encode( buffer, DN.getBytes( entry.getDn() ) );
 
             // The attributes sequence
             buffer.put( UniversalTag.SEQUENCE_TAG );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -50,7 +50,7 @@
     private int version;
 
     /** The name of the user requesting a bind */
-    private LdapDN name;
+    private DN name;
 
     /** The authentication used to bind the user */
     private LdapAuthentication authentication;
@@ -135,7 +135,7 @@
      * 
      * @return The user name
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -146,7 +146,7 @@
      * 
      * @param name The user name
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }
@@ -207,7 +207,7 @@
         bindRequestLength = 1 + 1 + 1; // Initialized with version
 
         // The name
-        bindRequestLength += 1 + TLV.getNbBytes( LdapDN.getNbBytes( name ) ) + LdapDN.getNbBytes( name );
+        bindRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( name ) ) + DN.getNbBytes( name );
 
         // The authentication
         bindRequestLength += authentication.computeLength();
@@ -250,7 +250,7 @@
         Value.encode( buffer, version );
 
         // The name
-        Value.encode( buffer, LdapDN.getBytes( name ) );
+        Value.encode( buffer, DN.getBytes( name ) );
 
         // The authentication
         authentication.encode( buffer );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -31,7 +31,7 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -58,7 +58,7 @@
     // ----------------------------------------------------------------------------
 
     /** The entry to be compared */
-    private LdapDN entry;
+    private DN entry;
 
     /** The attribute to be compared */
     private String attributeDesc;
@@ -113,7 +113,7 @@
      * 
      * @return Returns the entry.
      */
-    public LdapDN getEntry()
+    public DN getEntry()
     {
         return entry;
     }
@@ -124,7 +124,7 @@
      * 
      * @param entry The entry to set.
      */
-    public void setEntry( LdapDN entry )
+    public void setEntry( DN entry )
     {
         this.entry = entry;
     }
@@ -196,7 +196,7 @@
     protected int computeLengthProtocolOp()
     {
         // The entry
-        compareRequestLength = 1 + TLV.getNbBytes( LdapDN.getNbBytes( entry ) ) + LdapDN.getNbBytes( entry );
+        compareRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry ) ) + DN.getNbBytes( entry );
 
         // The attribute value assertion
         int attributeDescLength = StringTools.getBytesUtf8( attributeDesc ).length;
@@ -241,7 +241,7 @@
             buffer.put( TLV.getBytes( compareRequestLength ) );
 
             // The entry
-            Value.encode( buffer, LdapDN.getBytes( entry ) );
+            Value.encode( buffer, DN.getBytes( entry ) );
 
             // The attributeValueAssertion sequence Tag
             buffer.put( UniversalTag.SEQUENCE_TAG );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/DelRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -29,7 +29,7 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -48,7 +48,7 @@
     // ----------------------------------------------------------------------------
 
     /** The entry to be deleted */
-    private LdapDN entry;
+    private DN entry;
 
 
     // ~ Constructors
@@ -91,7 +91,7 @@
      * 
      * @return Returns the entry.
      */
-    public LdapDN getEntry()
+    public DN getEntry()
     {
         return entry;
     }
@@ -102,7 +102,7 @@
      * 
      * @param entry The entry to set.
      */
-    public void setEntry( LdapDN entry )
+    public void setEntry( DN entry )
     {
         this.entry = entry;
     }
@@ -120,7 +120,7 @@
     protected int computeLengthProtocolOp()
     {
         // The entry
-        return 1 + TLV.getNbBytes( LdapDN.getNbBytes( entry ) ) + LdapDN.getNbBytes( entry );
+        return 1 + TLV.getNbBytes( DN.getNbBytes( entry ) ) + DN.getNbBytes( entry );
     }
 
 
@@ -141,8 +141,8 @@
             buffer.put( LdapConstants.DEL_REQUEST_TAG );
 
             // The entry
-            buffer.put( TLV.getBytes( LdapDN.getNbBytes( entry ) ) );
-            buffer.put( LdapDN.getBytes( entry ) );
+            buffer.put( TLV.getBytes( DN.getNbBytes( entry ) ) );
+            buffer.put( DN.getBytes( entry ) );
         }
         catch ( BufferOverflowException boe )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/certGeneration/CertGenerationGrammar.java Wed Mar  3 23:05:29 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,7 +123,7 @@
 
                     if ( ( targetDN != null ) && ( targetDN.trim().length() > 0 ) )
                     {
-                        if( !LdapDN.isValid( targetDN ) )
+                        if( !DN.isValid( targetDN ) )
                         {
                             String msg = I18n.err( I18n.ERR_04032, targetDN );
                             LOG.error( msg );
@@ -169,7 +169,7 @@
 
                     if ( ( issuerDN != null ) && ( issuerDN.trim().length() > 0 ) )
                     {
-                        if( !LdapDN.isValid( issuerDN ) )
+                        if( !DN.isValid( issuerDN ) )
                         {
                             String msg = I18n.err( I18n.ERR_04034, issuerDN );
                             LOG.error( msg );
@@ -209,7 +209,7 @@
 
                     if ( ( subjectDN != null ) && ( subjectDN.trim().length() > 0 ) )
                     {
-                        if( !LdapDN.isValid( subjectDN ) )
+                        if( !DN.isValid( subjectDN ) )
                         {
                             String msg = I18n.err( I18n.ERR_04035, subjectDN );
                             LOG.error( msg );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -83,7 +83,7 @@
     // ----------------------------------------------------------------------------
 
     /** The DN to be modified. */
-    private LdapDN object;
+    private DN object;
 
     /** The modifications list. This is an array of Modification. */
     private List<Modification> modifications;
@@ -242,7 +242,7 @@
      * 
      * @return Returns the object.
      */
-    public LdapDN getObject()
+    public DN getObject()
     {
         return object;
     }
@@ -253,7 +253,7 @@
      * 
      * @param object The DN to set.
      */
-    public void setObject( LdapDN object )
+    public void setObject( DN object )
     {
         this.object = object;
     }
@@ -346,7 +346,7 @@
     protected int computeLengthProtocolOp()
     {
         // Initialized with object
-        modifyRequestLength = 1 + TLV.getNbBytes( LdapDN.getNbBytes( object ) ) + LdapDN.getNbBytes( object );
+        modifyRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( object ) ) + DN.getNbBytes( object );
 
         // Modifications
         modificationsLength = 0;
@@ -440,7 +440,7 @@
             buffer.put( TLV.getBytes( modifyRequestLength ) );
 
             // The entry
-            Value.encode( buffer, LdapDN.getBytes( object ) );
+            Value.encode( buffer, DN.getBytes( object ) );
 
             // The modifications sequence
             buffer.put( UniversalTag.SEQUENCE_TAG );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.ldap.codec.LdapConstants;
 import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -52,7 +52,7 @@
     // ----------------------------------------------------------------------------
 
     /** The DN to be modified. */
-    private LdapDN entry;
+    private DN entry;
 
     /** The new RDN to be added to the RDN or to the new superior, if present */
     private RDN newRDN;
@@ -61,7 +61,7 @@
     private boolean deleteOldRDN;
 
     /** The optional superior, which will be concatened to the newRdn */
-    private LdapDN newSuperior;
+    private DN newSuperior;
 
     /** The modify DN request length */
     private int modifyDNRequestLength;
@@ -107,7 +107,7 @@
      * 
      * @return Returns the entry.
      */
-    public LdapDN getEntry()
+    public DN getEntry()
     {
         return entry;
     }
@@ -118,7 +118,7 @@
      * 
      * @param entry The entry to set.
      */
-    public void setEntry( LdapDN entry )
+    public void setEntry( DN entry )
     {
         this.entry = entry;
     }
@@ -173,7 +173,7 @@
      * 
      * @return Returns the newSuperior.
      */
-    public LdapDN getNewSuperior()
+    public DN getNewSuperior()
     {
         return newSuperior;
     }
@@ -184,7 +184,7 @@
      * 
      * @param newSuperior The newSuperior to set.
      */
-    public void setNewSuperior( LdapDN newSuperior )
+    public void setNewSuperior( DN newSuperior )
     {
         this.newSuperior = newSuperior;
     }
@@ -215,13 +215,13 @@
     protected int computeLengthProtocolOp()
     {
         int newRdnlength = StringTools.getBytesUtf8( newRDN.toString() ).length;
-        modifyDNRequestLength = 1 + TLV.getNbBytes( LdapDN.getNbBytes( entry ) ) + LdapDN.getNbBytes( entry ) + 1
+        modifyDNRequestLength = 1 + TLV.getNbBytes( DN.getNbBytes( entry ) ) + DN.getNbBytes( entry ) + 1
             + TLV.getNbBytes( newRdnlength ) + newRdnlength + 1 + 1 + 1; // deleteOldRDN
 
         if ( newSuperior != null )
         {
-            modifyDNRequestLength += 1 + TLV.getNbBytes( LdapDN.getNbBytes( newSuperior ) )
-                + LdapDN.getNbBytes( newSuperior );
+            modifyDNRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( newSuperior ) )
+                + DN.getNbBytes( newSuperior );
         }
 
         return 1 + TLV.getNbBytes( modifyDNRequestLength ) + modifyDNRequestLength;
@@ -252,7 +252,7 @@
 
             // The entry
 
-            Value.encode( buffer, LdapDN.getBytes( entry ) );
+            Value.encode( buffer, DN.getBytes( entry ) );
 
             // The newRDN
             Value.encode( buffer, newRDN.toString() );
@@ -266,13 +266,13 @@
                 // Encode the reference
                 buffer.put( ( byte ) LdapConstants.MODIFY_DN_REQUEST_NEW_SUPERIOR_TAG );
 
-                int newSuperiorLength = LdapDN.getNbBytes( newSuperior );
+                int newSuperiorLength = DN.getNbBytes( newSuperior );
 
                 buffer.put( TLV.getBytes( newSuperiorLength ) );
 
                 if ( newSuperiorLength != 0 )
                 {
-                    buffer.put( LdapDN.getBytes( newSuperior ) );
+                    buffer.put( DN.getBytes( newSuperior ) );
                 }
             }
         }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java Wed Mar  3 23:05:29 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -57,7 +57,7 @@
     // ----------------------------------------------------------------------------
 
     /** The base DN */
-    private LdapDN baseObject;
+    private DN baseObject;
 
     /** The scope. It could be baseObject, singleLevel or wholeSubtree. */
     private SearchScope scope;
@@ -166,7 +166,7 @@
      * 
      * @return Returns the baseObject.
      */
-    public LdapDN getBaseObject()
+    public DN getBaseObject()
     {
         return baseObject;
     }
@@ -177,7 +177,7 @@
      * 
      * @param baseObject The baseObject to set.
      */
-    public void setBaseObject( LdapDN baseObject )
+    public void setBaseObject( DN baseObject )
     {
         this.baseObject = baseObject;
     }
@@ -477,8 +477,8 @@
         searchRequestLength = 0;
 
         // The baseObject
-        searchRequestLength += 1 + TLV.getNbBytes( LdapDN.getNbBytes( baseObject ) )
-            + LdapDN.getNbBytes( baseObject );
+        searchRequestLength += 1 + TLV.getNbBytes( DN.getNbBytes( baseObject ) )
+            + DN.getNbBytes( baseObject );
 
         // The scope
         searchRequestLength += 1 + 1 + 1;
@@ -562,7 +562,7 @@
             buffer.put( TLV.getBytes( searchRequestLength ) );
 
             // The baseObject
-            Value.encode( buffer, LdapDN.getBytes( baseObject ) );
+            Value.encode( buffer, DN.getBytes( baseObject ) );
 
             // The scope
             Value.encodeEnumerated( buffer, scope.getScope() );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java Wed Mar  3 23:05:29 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -132,7 +132,7 @@
      * 
      * @return Returns the objectName.
      */
-    public LdapDN getObjectName()
+    public DN getObjectName()
     {
         return entry.getDn();
     }
@@ -143,7 +143,7 @@
      * 
      * @param objectName The objectName to set.
      */
-    public void setObjectName( LdapDN objectName )
+    public void setObjectName( DN objectName )
     {
         entry.setDn( objectName );
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControl.java Wed Mar  3 23:05:29 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.AbstractControl;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -94,7 +94,7 @@
     private long changeNumber = UNDEFINED_CHANGE_NUMBER;
 
     /** The previous DN */
-    private LdapDN previousDn = null;
+    private DN previousDn = null;
     
     /** A temporary storage for the previous DN */
     private byte[] previousDnBytes = null;
@@ -252,13 +252,13 @@
     }
 
 
-    public LdapDN getPreviousDn()
+    public DN getPreviousDn()
     {
         return previousDn;
     }
 
 
-    public void setPreviousDn( LdapDN previousDn )
+    public void setPreviousDn( DN previousDn )
     {
         this.previousDn = previousDn;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java Wed Mar  3 23:05:29 2010
@@ -36,7 +36,7 @@
 import org.apache.directory.shared.asn1.util.LongDecoderException;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -171,11 +171,11 @@
                 else
                 {
                     Value value = entryChangeContainer.getCurrentTLV().getValue();
-                    LdapDN previousDn = null;
+                    DN previousDn = null;
 
                     try
                     {
-                        previousDn = new LdapDN( StringTools.utf8ToString( value.getData() ) );
+                        previousDn = new DN( StringTools.utf8ToString( value.getData() ) );
                     }
                     catch ( InvalidNameException ine )
                     {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/AbstractEntry.java Wed Mar  3 23:05:29 2010
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -36,7 +36,7 @@
 public abstract class AbstractEntry<K> implements Entry
 {
     /** The DN for this entry */
-    protected LdapDN dn;
+    protected DN dn;
     
     /** A map containing all the attributes for this entry */
     protected Map<K, EntryAttribute> attributes = new HashMap<K, EntryAttribute>();
@@ -47,7 +47,7 @@
      *
      * @return The entry's DN
      */
-    public LdapDN getDn()
+    public DN getDn()
     {
         return dn;
     }
@@ -58,7 +58,7 @@
      *
      * @param dn The DN associated with this entry
      */
-    public void setDn( LdapDN dn )
+    public void setDn( DN dn )
     {
         this.dn = dn;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/Entry.java Wed Mar  3 23:05:29 2010
@@ -25,7 +25,7 @@
 
 import javax.naming.NamingException;
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -62,7 +62,7 @@
      *
      * @return The entry's DN
      */
-    LdapDN getDn();
+    DN getDn();
 
 
     /**
@@ -112,7 +112,7 @@
      *
      * @param dn The DN associated with this entry
      */
-    void setDn( LdapDN dn );
+    void setDn( DN dn );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/entry/client/DefaultClientEntry.java Wed Mar  3 23:05:29 2010
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@
      */
     public DefaultClientEntry()
     {
-        dn = LdapDN.EMPTY_LDAPDN;
+        dn = DN.EMPTY_DN;
     }
 
 
@@ -81,7 +81,7 @@
      * 
      * @param dn The DN for this serverEntry. Can be null.
      */
-    public DefaultClientEntry( LdapDN dn )
+    public DefaultClientEntry( DN dn )
     {
         this.dn = dn;
     }
@@ -94,7 +94,7 @@
      * @param dn The DN for this serverEntry. Can be null.
      * @param upIds The list of attributes to create.
      */
-    public DefaultClientEntry( LdapDN dn, String... upIds )
+    public DefaultClientEntry( DN dn, String... upIds )
     {
         this.dn = dn;
 
@@ -115,7 +115,7 @@
      * @param dn The DN for this serverEntry. Can be null
      * @param attributes The list of attributes to create
      */
-    public DefaultClientEntry( LdapDN dn, EntryAttribute... attributes )
+    public DefaultClientEntry( DN dn, EntryAttribute... attributes )
     {
         this.dn = dn;
 
@@ -302,7 +302,7 @@
         // First, clone the DN, if not null.
         if ( dn != null )
         {
-            clone.setDn( (LdapDN)dn.clone() );
+            clone.setDn( (DN)dn.clone() );
         }
         
         // then clone the ClientAttribute Map.
@@ -955,7 +955,7 @@
         if ( dn == null )
         {
             // Write an empty DN
-            out.writeObject( LdapDN.EMPTY_LDAPDN );
+            out.writeObject( DN.EMPTY_DN );
         }
         else
         {
@@ -984,7 +984,7 @@
     public void readExternal( ObjectInput in ) throws IOException, ClassNotFoundException
     {
         // Read the DN
-        dn = (LdapDN)in.readObject();
+        dn = (DN)in.readObject();
         
         // Read the number of attributes
         int nbAttributes = in.readInt();

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -72,7 +72,7 @@
      * 
      * @return the Dn of the added entry.
      */
-    public LdapDN getEntryDn()
+    public DN getEntryDn()
     {
         return entry.getDn();
     }
@@ -83,7 +83,7 @@
      * 
      * @param entry the Dn of the added entry.
      */
-    public void setEntryDn( LdapDN dn )
+    public void setEntryDn( DN dn )
     {
         entry.setDn( dn );
     }

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -46,7 +46,7 @@
      * Distinguished name identifying the name of the authenticating subject -
      * defaults to the empty string
      */
-    private LdapDN name;
+    private DN name;
 
     /** The passwords, keys or tickets used to verify user identity */
     private byte[] credentials;
@@ -200,11 +200,11 @@
      * 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 LDAPDN in the credentials.
+     * includes the DN in the credentials.
      * 
      * @return the DN of the authenticating user.
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -215,13 +215,13 @@
      * 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 LDAPDN in the credentials.
+     * mechanism that includes the DN in the credentials.
      * 
      * @param name
      *            the DN of the authenticating user - leave null for annonymous
      *            user.
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }
@@ -354,8 +354,8 @@
             return false;
         }
 
-        LdapDN dn1 = req.getName();
-        LdapDN 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/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -42,7 +42,7 @@
     static final long serialVersionUID = 1699731530016468977L;
 
     /** Distinguished name identifying the compared entry */
-    private LdapDN name;
+    private DN name;
 
     /** The id of the attribute used in the comparison */
     private String attrId;
@@ -80,7 +80,7 @@
      * 
      * @return the DN of the compared entry.
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -93,7 +93,7 @@
      * @param name
      *            the DN of the compared entry.
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }
@@ -215,7 +215,7 @@
         }
 
         InternalCompareRequest req = ( InternalCompareRequest ) obj;
-        LdapDN 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/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java?rev=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -37,7 +37,7 @@
     static final long serialVersionUID = 3187847454305567542L;
 
     /** The distinguished name of the entry to delete */
-    private LdapDN name;
+    private DN name;
 
     private InternalDeleteResponse response;
 
@@ -69,7 +69,7 @@
      * 
      * @return the DN of the leaf entry to delete.
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -82,7 +82,7 @@
      * @param name
      *            the DN of the leaf entry to delete.
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -22,7 +22,7 @@
 
 import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -36,7 +36,7 @@
     static final long serialVersionUID = -1446626887394613213L;
 
     /** Lowest matched entry Dn - defaults to empty string */
-    private LdapDN matchedDn;
+    private DN matchedDn;
 
     /** Referral associated with this LdapResult if the errorCode is REFERRAL */
     private InternalReferral referral;
@@ -90,7 +90,7 @@
      * 
      * @return the Dn of the lowest matched entry.
      */
-    public LdapDN getMatchedDn()
+    public DN getMatchedDn()
     {
         return matchedDn;
     }
@@ -103,7 +103,7 @@
      * @param matchedDn
      *            the Dn of the lowest matched entry.
      */
-    public void setMatchedDn( LdapDN matchedDn )
+    public void setMatchedDn( DN matchedDn )
     {
         this.matchedDn = matchedDn;
     }

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
 
@@ -38,13 +38,13 @@
     static final long serialVersionUID = 1233507339633051696L;
 
     /** PDU's modify Dn candidate <b>entry</b> distinguished name property */
-    private LdapDN name;
+    private DN name;
 
     /** PDU's <b>newrdn</b> relative distinguished name property */
     private RDN newRdn;
 
     /** PDU's <b>newSuperior</b> distinguished name property */
-    private LdapDN newSuperior;
+    private DN newSuperior;
 
     /** PDU's <b>deleteOldRdn</b> flag */
     private boolean deleteOldRdn = false;
@@ -124,7 +124,7 @@
      * 
      * @return the distinguished name of the entry.
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -137,7 +137,7 @@
      * @param name
      *            the distinguished name of the entry.
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }
@@ -176,7 +176,7 @@
      * 
      * @return the dn of the superior entry the candidate entry is moved under.
      */
-    public LdapDN getNewSuperior()
+    public DN getNewSuperior()
     {
         return newSuperior;
     }
@@ -193,7 +193,7 @@
      *            the dn of the superior entry the candidate entry for DN
      *            modification is moved under.
      */
-    public void setNewSuperior( LdapDN newSuperior )
+    public void setNewSuperior( DN newSuperior )
     {
         this.newSuperior = newSuperior;
     }

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +51,7 @@
     private static final transient Logger LOG = LoggerFactory.getLogger( ModifyRequestImpl.class );
 
     /** Dn of the entry to modify or PDU's <b>object</b> field */
-    private LdapDN name;
+    private DN name;
 
     /** Sequence of modifications or PDU's <b>modification</b> seqence field */
     private List<Modification> mods = new ArrayList<Modification>();
@@ -97,7 +97,7 @@
      * 
      * @return the DN of the modified entry.
      */
-    public LdapDN getName()
+    public DN getName()
     {
         return name;
     }
@@ -110,7 +110,7 @@
      * @param name
      *            the DN of the modified entry.
      */
-    public void setName( LdapDN name )
+    public void setName( DN name )
     {
         this.name = name;
     }

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=918756&r1=918755&r2=918756&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 Wed Mar  3 23:05:29 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseDone;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -47,7 +47,7 @@
     static final long serialVersionUID = -5655881944020886218L;
 
     /** Search base distinguished name */
-    private LdapDN baseDn;
+    private DN baseDn;
 
     /** Search filter expression tree's root node */
     private ExprNode filter;
@@ -128,7 +128,7 @@
      * 
      * @return the search base
      */
-    public LdapDN getBase()
+    public DN getBase()
     {
         return baseDn;
     }
@@ -140,7 +140,7 @@
      * @param base
      *            the search base
      */
-    public void setBase( LdapDN base )
+    public void setBase( DN base )
     {
         baseDn = base;
     }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java Wed Mar  3 23:05:29 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.internal.InternalAbstractResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -87,7 +87,7 @@
      * 
      * @return the Dn of the entry returned.
      */
-    public LdapDN getObjectName()
+    public DN getObjectName()
     {
         return ( entry == null ? null : entry.getDn() );
     }
@@ -99,7 +99,7 @@
      * @param objectName
      *            the Dn of the entry returned.
      */
-    public void setObjectName( LdapDN objectName )
+    public void setObjectName( DN objectName )
     {
         if ( entry != null )
         {

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java Wed Mar  3 23:05:29 2010
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -47,7 +47,7 @@
      * 
      * @return the Dn of the added entry.
      */
-    LdapDN getEntryDn();
+    DN getEntryDn();
 
 
     /**
@@ -55,7 +55,7 @@
      * 
      * @param entry the Dn of the added entry.
      */
-    void setEntryDn( LdapDN entry );
+    void setEntryDn( DN entry );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java Wed Mar  3 23:05:29 2010
@@ -21,7 +21,7 @@
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -92,11 +92,11 @@
      * 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 LDAPDN in the credentials.
+     * includes the DN in the credentials.
      * 
      * @return the DN of the authenticating user.
      */
-    LdapDN getName();
+    DN getName();
 
 
     /**
@@ -104,13 +104,13 @@
      * 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 LDAPDN in the credentials.
+     * mechanism that includes the DN in the credentials.
      * 
      * @param name
      *            the DN of the authenticating user - leave null for annonymous
      *            user.
      */
-    void setName( LdapDN name );
+    void setName( DN name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java Wed Mar  3 23:05:29 2010
@@ -22,7 +22,7 @@
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -47,7 +47,7 @@
      * 
      * @return the DN of the compared entry.
      */
-    LdapDN getName();
+    DN getName();
 
 
     /**
@@ -56,7 +56,7 @@
      * 
      * @param name the DN of the compared entry.
      */
-    void setName( LdapDN name );
+    void setName( DN name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java Wed Mar  3 23:05:29 2010
@@ -21,7 +21,7 @@
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -46,7 +46,7 @@
      * 
      * @return the DN of the leaf entry to delete.
      */
-    LdapDN getName();
+    DN getName();
 
 
     /**
@@ -55,5 +55,5 @@
      * 
      * @param name the DN of the leaf entry to delete.
      */
-    void setName( LdapDN name );
+    void setName( DN name );
 }

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java Wed Mar  3 23:05:29 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.ldap.message.internal;
 
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -76,7 +76,7 @@
      * 
      * @return the Dn of the lowest matched entry.
      */
-    LdapDN getMatchedDn();
+    DN getMatchedDn();
 
 
     /**
@@ -86,7 +86,7 @@
      * @param dn
      *            the Dn of the lowest matched entry.
      */
-    void setMatchedDn( LdapDN dn );
+    void setMatchedDn( DN dn );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java Wed Mar  3 23:05:29 2010
@@ -21,7 +21,7 @@
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
 
@@ -82,7 +82,7 @@
      * 
      * @return the distinguished name of the entry.
      */
-    LdapDN getName();
+    DN getName();
 
 
     /**
@@ -92,7 +92,7 @@
      * @param name
      *            the distinguished name of the entry.
      */
-    void setName( LdapDN name );
+    void setName( DN name );
 
 
     /**
@@ -147,7 +147,7 @@
      * 
      * @return the dn of the superior entry the candidate entry is moved under.
      */
-    LdapDN getNewSuperior();
+    DN getNewSuperior();
 
 
     /**
@@ -161,7 +161,7 @@
      *            the dn of the superior entry the candidate entry for DN
      *            modification is moved under.
      */
-    void setNewSuperior( LdapDN newSuperior );
+    void setNewSuperior( DN newSuperior );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java Wed Mar  3 23:05:29 2010
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.message.SingleReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -112,7 +112,7 @@
      * 
      * @return the DN of the modified entry.
      */
-    LdapDN getName();
+    DN getName();
 
 
     /**
@@ -122,7 +122,7 @@
      * @param name
      *            the DN of the modified entry.
      */
-    void setName( LdapDN name );
+    void setName( DN name );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java Wed Mar  3 23:05:29 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ManyReplyRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -70,7 +70,7 @@
      * 
      * @return the search base
      */
-    LdapDN getBase();
+    DN getBase();
 
 
     /**
@@ -78,7 +78,7 @@
      * 
      * @param baseDn the search base
      */
-    void setBase( LdapDN baseDn );
+    void setBase( DN baseDn );
 
 
     /**

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java Wed Mar  3 23:05:29 2010
@@ -23,7 +23,7 @@
 
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -44,7 +44,7 @@
      * 
      * @return the Dn of the entry returned.
      */
-    LdapDN getObjectName();
+    DN getObjectName();
 
 
     /**
@@ -52,7 +52,7 @@
      * 
      * @param dn the Dn of the entry returned.
      */
-    void setObjectName( LdapDN dn );
+    void setObjectName( DN dn );
 
 
     /**

Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java (from r918714, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java&r1=918714&r2=918756&rev=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexLdapDnParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/name/ComplexDnParser.java Wed Mar  3 23:05:29 2010
@@ -32,7 +32,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664290 $, $Date: 2008-06-07 08:28:06 +0200 (Sa, 07 Jun 2008) $
  */
-public class ComplexLdapDnParser
+public class ComplexDnParser
 {
 
     /**



Mime
View raw message