directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [23/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/tree/DnNode.java Sun Jan 23 01:17:06 2011
@@ -27,8 +27,8 @@ import java.util.concurrent.ConcurrentHa
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  * A node may contain a reference to an object whose suffix is the path through the
  * nodes of the tree from the root. <br/>
  * A node may also have no attached element.<br/>
- * Each node is referenced by a RDN, and holds the full DN corresponding to its position<br/>
+ * Each node is referenced by a Rdn, and holds the full Dn corresponding to its position<br/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @param <N> The type of node we store
@@ -54,10 +54,10 @@ public class DnNode<N> implements Clonea
     private N nodeElement;
 
     /** The node's key */
-    private RDN nodeRdn;
+    private Rdn nodeRdn;
 
-    /** The node's DN */
-    private DN nodeDn;
+    /** The node's Dn */
+    private Dn nodeDn;
 
     /** The node's depth in the tree */
     private int depth;
@@ -66,19 +66,19 @@ public class DnNode<N> implements Clonea
     private DnNode<N> parent;
 
     /** Stores the list of all the descendant */
-    private Map<RDN, DnNode<N>> children;
+    private Map<Rdn, DnNode<N>> children;
 
     //-------------------------------------------------------------------------
     // Helper methods
     //-------------------------------------------------------------------------
     /**
-     * Check that the DN is not null
+     * Check that the Dn is not null
      */
-    private void checkDn( DN dn ) throws LdapException
+    private void checkDn( Dn dn ) throws LdapException
     {
         if ( ( dn == null ) || dn.isEmpty() )
         {
-            String message = "Cannot process an empty DN";
+            String message = "Cannot process an empty Dn";
             LOG.error( message );
             throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, message );
         }
@@ -87,14 +87,14 @@ public class DnNode<N> implements Clonea
     /**
      * Create a new DnNode, recursively creating all the intermediate nodes.
      */
-    private DnNode<N> createNode( DN dn, N element, int nbRdns ) throws LdapException
+    private DnNode<N> createNode( Dn dn, N element, int nbRdns ) throws LdapException
     {
         checkDn( dn );
 
         DnNode<N> rootNode = null;
 
         // No parent : add from the current position
-        for ( RDN rdn : dn.getRdns() )
+        for ( Rdn rdn : dn.getRdns() )
         {
             if ( nbRdns == 0 )
             {
@@ -146,9 +146,9 @@ public class DnNode<N> implements Clonea
      */
     public DnNode()
     {
-        children = new ConcurrentHashMap<RDN, DnNode<N>>();
-        nodeDn = DN.EMPTY_DN;
-        nodeRdn = RDN.EMPTY_RDN;
+        children = new ConcurrentHashMap<Rdn, DnNode<N>>();
+        nodeDn = Dn.EMPTY_DN;
+        nodeRdn = Rdn.EMPTY_RDN;
     }
 
 
@@ -160,22 +160,22 @@ public class DnNode<N> implements Clonea
     public DnNode( N element )
     {
         this.nodeElement = element;
-        children = new ConcurrentHashMap<RDN, DnNode<N>>();
+        children = new ConcurrentHashMap<Rdn, DnNode<N>>();
     }
 
 
     /**
      * Creates a new instance of DnNode.
      *
-     * @param dn the node's DN
+     * @param dn the node's Dn
      * @param element the element to store
      */
-    public DnNode( DN dn, N element )
+    public DnNode( Dn dn, N element )
     {
         if ( ( dn == null ) || ( dn.isEmpty() ) )
         {
-            children = new ConcurrentHashMap<RDN, DnNode<N>>();
-            this.nodeDn = DN.EMPTY_DN;
+            children = new ConcurrentHashMap<Rdn, DnNode<N>>();
+            this.nodeDn = Dn.EMPTY_DN;
 
             return;
         }
@@ -194,7 +194,7 @@ public class DnNode<N> implements Clonea
         }
         catch ( LdapException le )
         {
-            // Special cas e: the DN is empty, this is not allowed
+            // Special cas e: the Dn is empty, this is not allowed
             throw new IllegalArgumentException( le.getMessage() );
         }
     }
@@ -216,10 +216,10 @@ public class DnNode<N> implements Clonea
      * Tells if the implementation is a leaf node. If it's a branch node
      * then false is returned.
      *
-     * @param dn The DN we want to check
+     * @param dn The Dn we want to check
      * @return <code>true</code> if this is a leaf node, false otherwise.
      */
-    public boolean isLeaf( DN dn )
+    public boolean isLeaf( Dn dn )
     {
         DnNode<N> node = getNode( dn );
 
@@ -267,9 +267,9 @@ public class DnNode<N> implements Clonea
 
     /**
      * @return Return the stored element, if any
-     * @param dn The DN we want to get the element for
+     * @param dn The Dn we want to get the element for
      */
-    public N getElement( DN dn )
+    public N getElement( Dn dn )
     {
         DnNode<N> node = getNode( dn );
 
@@ -295,9 +295,9 @@ public class DnNode<N> implements Clonea
     /**
      * @return True if the Node stores an element. BranchNode may not hold any
      * element.
-     * @param dn The DN we want to get the element for
+     * @param dn The Dn we want to get the element for
      */
-    public boolean hasElement( DN dn )
+    public boolean hasElement( Dn dn )
     {
         DnNode<N> node = getNode( dn );
 
@@ -341,9 +341,9 @@ public class DnNode<N> implements Clonea
     /**
      * @return True if one of the node below the current node has one element, 
      * False otherwise
-     * @param dn The DN we want to get the element for
+     * @param dn The Dn we want to get the element for
      */
-    public boolean hasDescendantElement( DN dn )
+    public boolean hasDescendantElement( Dn dn )
     {
         DnNode<N> node = getNode( dn );
 
@@ -401,9 +401,9 @@ public class DnNode<N> implements Clonea
     /**
      * @return True if one of the node below the current node has one element, 
      * False otherwise
-     * @param dn The DN we want to get the element for
+     * @param dn The Dn we want to get the element for
      */
-    public List<N> getDescendantElements( DN dn )
+    public List<N> getDescendantElements( Dn dn )
     {
         List<N> descendants = new ArrayList<N>();
         
@@ -446,11 +446,11 @@ public class DnNode<N> implements Clonea
     /**
      * Tells if a node has some children or not.
      *
-     * @param dn the node's DN
+     * @param dn the node's Dn
      * @return <code>true</code> if the node has some children
-     * @throws LdapException if the DN is null or empty
+     * @throws LdapException if the Dn is null or empty
      */
-    public boolean hasChildren( DN dn ) throws LdapException
+    public boolean hasChildren( Dn dn ) throws LdapException
     {
         checkDn( dn );
 
@@ -463,7 +463,7 @@ public class DnNode<N> implements Clonea
     /**
      * @return The list of DnNode
      */
-    public Map<RDN, DnNode<N>> getChildren()
+    public Map<Rdn, DnNode<N>> getChildren()
     {
         return children;
     }
@@ -488,26 +488,26 @@ public class DnNode<N> implements Clonea
 
 
     /**
-     * Tells if there is a parent for a given DN,. This parent should be a
+     * Tells if there is a parent for a given Dn,. This parent should be a
      * subset of the given dn.<br>
      * For instance, if we have stored dc=acme, dc=org into the tree,
-     * the DN: ou=example, dc=acme, dc=org will have a parent
-     * <br>For the DN ou=apache, dc=org, there is no parent, so false will be returned.
+     * the Dn: ou=example, dc=acme, dc=org will have a parent
+     * <br>For the Dn ou=apache, dc=org, there is no parent, so false will be returned.
      *
      * @param dn the normalized distinguished name to resolve to a parent
      * @return true if there is a parent associated with the normalized dn
      */
-    public boolean hasParent( DN dn )
+    public boolean hasParent( Dn dn )
     {
-        List<RDN> rdns = dn.getRdns();
+        List<Rdn> rdns = dn.getRdns();
 
         DnNode<N> currentNode = this;
         DnNode<N> parentNode = null;
 
-        // Iterate through all the RDN until we find the associated partition
+        // Iterate through all the Rdn until we find the associated partition
         for ( int i = rdns.size() - 1; i >= 0; i-- )
         {
-            RDN rdn = rdns.get( i );
+            Rdn rdn = rdns.get( i );
 
             if ( rdn.equals( currentNode.nodeRdn ) )
             {
@@ -537,24 +537,24 @@ public class DnNode<N> implements Clonea
     /**
      * Add a new node in the tree. The added node won't have any element.
      *
-     * @param dn The node's DN
-     * @throws LdapException if the DN is null or empty
+     * @param dn The node's Dn
+     * @throws LdapException if the Dn is null or empty
      */
-    public void add( DN dn ) throws LdapException
+    public void add( Dn dn ) throws LdapException
     {
         add( dn, null );
     }
 
 
     /**
-     * Add a new node in the tree. We can't add a node if its DN is empty. The
-     * added element is attached to the node, which is named by the DN's RDN.<br/>
+     * Add a new node in the tree. We can't add a node if its Dn is empty. The
+     * added element is attached to the node, which is named by the Dn's Rdn.<br/>
      *
-     * @param dn The node's DN
+     * @param dn The node's Dn
      * @param element The element to associate with this Node. Can be null.
-     * @throws LdapException if the DN is null or empty
+     * @throws LdapException if the Dn is null or empty
      */
-    public void add( DN dn, N element ) throws LdapException
+    public void add( Dn dn, N element ) throws LdapException
     {
         checkDn( dn );
 
@@ -575,14 +575,14 @@ public class DnNode<N> implements Clonea
 
             if ( nbRdns == 0 )
             {
-                // That means the added DN is already present. Check if it already has an element
+                // That means the added Dn is already present. Check if it already has an element
                 if ( parentNode.hasElement() )
                 {
                     String message = "Cannot add a node to a node already having an element";
                     LOG.error( message );
                     throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, message );
                 }
-                // We may try to add twice the same DN, without any element
+                // We may try to add twice the same Dn, without any element
                 else if ( element == null )
                 {
                     String message = "Cannot add a node with no element if it already exists";
@@ -610,10 +610,10 @@ public class DnNode<N> implements Clonea
     /**
      * Removes a node from the tree.
      *
-     * @param dn the node's DN
-     * @throws LdapException if the DN is null or empty
+     * @param dn the node's Dn
+     * @throws LdapException if the Dn is null or empty
      */
-    public void remove( DN dn ) throws LdapException
+    public void remove( Dn dn ) throws LdapException
     {
         checkDn( dn );
 
@@ -626,17 +626,17 @@ public class DnNode<N> implements Clonea
             return;
         }
 
-        // Now, check that this parent has the same DN than the one
+        // Now, check that this parent has the same Dn than the one
         // we gave and that there is no children
         if ( ( dn.size() != parentNode.depth ) || parentNode.hasChildren() )
         {
             return;
         }
 
-        // Ok, no children, same DN, let's remove what we can.
+        // Ok, no children, same Dn, let's remove what we can.
         parentNode = parentNode.getParent();
 
-        for ( RDN rdn : dn.getRdns() )
+        for ( Rdn rdn : dn.getRdns() )
         {
             parentNode.children.remove( rdn );
 
@@ -658,7 +658,7 @@ public class DnNode<N> implements Clonea
      * @param rdn The name we are looking for
      * @return <code>true</code> if the tree instance contains this name
      */
-    public boolean contains( RDN rdn )
+    public boolean contains( Rdn rdn )
     {
         return children.containsKey( rdn );
     }
@@ -670,7 +670,7 @@ public class DnNode<N> implements Clonea
      * @param rdn the rdn to use as the node key
      * @return the child node corresponding to the rdn.
      */
-    public DnNode<N> getChild( RDN rdn )
+    public DnNode<N> getChild( Rdn rdn )
     {
         if ( children.containsKey( rdn ) )
         {
@@ -682,35 +682,35 @@ public class DnNode<N> implements Clonea
 
 
     /**
-     * @return The Node's RDN
+     * @return The Node's Rdn
      */
-    public RDN getRdn()
+    public Rdn getRdn()
     {
         return nodeRdn;
     }
 
 
     /**
-     * Get the Node for a given DN, if present in the tree.<br>
+     * Get the Node for a given Dn, if present in the tree.<br>
      * For instance, if we have stored dc=acme, dc=org into the tree,
-     * the DN: ou=example, dc=acme, dc=org will have a parent, and
+     * the Dn: ou=example, dc=acme, dc=org will have a parent, and
      * dc=acme, dc=org will be returned.
-     * <br>For the DN ou=apache, dc=org, there is no parent, so null will be returned.
+     * <br>For the Dn ou=apache, dc=org, there is no parent, so null will be returned.
      *
      * @param dn the normalized distinguished name to resolve to a parent
      * @return the Node associated with the normalized dn
      */
-    public DnNode<N> getNode( DN dn )
+    public DnNode<N> getNode( Dn dn )
     {
-        List<RDN> rdns = dn.getRdns();
+        List<Rdn> rdns = dn.getRdns();
 
         DnNode<N> currentNode = this;
         DnNode<N> parentNode = null;
 
-        // Iterate through all the RDN until we find the associated partition
+        // Iterate through all the Rdn until we find the associated partition
         for ( int i = rdns.size() - 1; i >= 0; i-- )
         {
-            RDN rdn = rdns.get( i );
+            Rdn rdn = rdns.get( i );
 
             if ( currentNode.hasChildren() )
             {
@@ -734,26 +734,26 @@ public class DnNode<N> implements Clonea
 
 
     /**
-     * Get the closest Node for a given DN which has an element, if present in the tree.<br>
+     * Get the closest Node for a given Dn which has an element, if present in the tree.<br>
      * For instance, if we have stored dc=acme, dc=org into the tree,
-     * the DN: ou=example, dc=acme, dc=org will have a parent, and
+     * the Dn: ou=example, dc=acme, dc=org will have a parent, and
      * dc=acme, dc=org will be returned if it has an associated element.
-     * <br>For the DN ou=apache, dc=org, there is no parent, so null will be returned.
+     * <br>For the Dn ou=apache, dc=org, there is no parent, so null will be returned.
      *
      * @param dn the normalized distinguished name to resolve to a parent
      * @return the Node associated with the normalized dn
      */
-    public boolean hasParentElement( DN dn )
+    public boolean hasParentElement( Dn dn )
     {
-        List<RDN> rdns = dn.getRdns();
+        List<Rdn> rdns = dn.getRdns();
 
         DnNode<N> currentNode = this;
         boolean hasElement = false;
 
-        // Iterate through all the RDN until we find the associated partition
+        // Iterate through all the Rdn until we find the associated partition
         for ( int i = rdns.size() - 1; i >= 0; i-- )
         {
-            RDN rdn = rdns.get( i );
+            Rdn rdn = rdns.get( i );
 
             if ( currentNode.hasChildren() )
             {
@@ -836,7 +836,7 @@ public class DnNode<N> implements Clonea
 
         if ( hasChildren )
         {
-            for ( RDN rdn : children.keySet() )
+            for ( Rdn rdn : children.keySet() )
             {
                 if ( isFirst )
                 {
@@ -868,7 +868,7 @@ public class DnNode<N> implements Clonea
     /**
      * @return the dn
      */
-    public DN getDn()
+    public Dn getDn()
     {
         return nodeDn;
     }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.aci.UserClass.Name;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,21 +57,21 @@ public class UserClass_NameTest
     @Before
     public void initNames() throws LdapInvalidDnException
     {
-        Set<DN> dnSetA = new HashSet<DN>();
-        dnSetA.add( new DN( "a=aa" ) );
-        dnSetA.add( new DN( "b=bb" ) );
-
-        Set<DN> dnSetB = new HashSet<DN>();
-        dnSetB.add( new DN( "b=bb" ) );
-        dnSetB.add( new DN( "a=aa" ) );
-
-        Set<DN> dnSetC = new HashSet<DN>();
-        dnSetC.add( new DN( "a=aa" ) );
-        dnSetC.add( new DN( "b=bb" ) );
-
-        Set<DN> dnSetD = new HashSet<DN>();
-        dnSetD.add( new DN( "b=bb" ) );
-        dnSetD.add( new DN( "c=cc" ) );
+        Set<Dn> dnSetA = new HashSet<Dn>();
+        dnSetA.add( new Dn( "a=aa" ) );
+        dnSetA.add( new Dn( "b=bb" ) );
+
+        Set<Dn> dnSetB = new HashSet<Dn>();
+        dnSetB.add( new Dn( "b=bb" ) );
+        dnSetB.add( new Dn( "a=aa" ) );
+
+        Set<Dn> dnSetC = new HashSet<Dn>();
+        dnSetC.add( new Dn( "a=aa" ) );
+        dnSetC.add( new Dn( "b=bb" ) );
+
+        Set<Dn> dnSetD = new HashSet<Dn>();
+        dnSetD.add( new Dn( "b=bb" ) );
+        dnSetD.add( new Dn( "c=cc" ) );
 
         nameA = new Name( dnSetA );
         nameACopy = new Name( dnSetB );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import java.util.Set;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.aci.UserClass.Subtree;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.subtree.BaseSubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.junit.Before;
@@ -61,7 +61,7 @@ public class UserClass_SubtreeTest
         SubtreeSpecification subtreeSpecA = new BaseSubtreeSpecification();
         SubtreeSpecification subtreeSpecB = new BaseSubtreeSpecification();
         SubtreeSpecification subtreeSpecC = new BaseSubtreeSpecification();
-        SubtreeSpecification subtreeSpecD = new BaseSubtreeSpecification( new DN( "cn=dummy" ) );
+        SubtreeSpecification subtreeSpecD = new BaseSubtreeSpecification( new Dn( "cn=dummy" ) );
 
         Set<SubtreeSpecification> colA = new HashSet<SubtreeSpecification>();
         colA.add( subtreeSpecA );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Sun Jan 23 01:17:06 2011
@@ -180,7 +180,7 @@ public class LdapResultTest
 
 
     /**
-     * Test the decoding of a AddResponse with no matched DN
+     * Test the decoding of a AddResponse with no matched Dn
      */
     @Test
     public void testDecodeAddResponseEmptyResultCodeNoMatchedDN()
@@ -231,7 +231,7 @@ public class LdapResultTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 0x69, 0x05, // CHOICE { ..., addResponse AddResponse, ...
                 0x0A, 0x01, 0x00, // resultCode success
-                0x04, 0x00 // Empty matched DN
+                0x04, 0x00 // Empty matched Dn
             } );
 
         stream.flip();
@@ -269,7 +269,7 @@ public class LdapResultTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 0x69, 0x07, // CHOICE { ..., addResponse AddResponse, ...
                 0x0A, 0x01, 0x00, // resultCode success
-                0x04, 0x00, // Empty matched DN
+                0x04, 0x00, // Empty matched Dn
                 0x04, 0x00 // Empty errorMessage
             } );
 
@@ -332,7 +332,7 @@ public class LdapResultTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 0x69, 0x13, // CHOICE { ..., addResponse AddResponse, ...
                 0x0A, 0x01, 0x0A, // resultCode success (Referral)
-                0x04, 0x00, // Empty matched DN
+                0x04, 0x00, // Empty matched Dn
                 0x04, 0x00, // Empty errorMessage
                 ( byte ) 0xA3, 0x0A, 0x04, 0x08, 'l', 'd', 'a', 'p', ':', '/', '/', '/' } );
 
@@ -408,7 +408,7 @@ public class LdapResultTest
                 0x0A, 0x01,
                 0x0A, // resultCode success (Referral)
                 0x04,
-                0x00, // Empty matched DN
+                0x00, // Empty matched Dn
                 0x04,
                 0x00, // Empty errorMessage
                 ( byte ) 0xA3, 0x14, 0x04, 0x08, 'l', 'd', 'a', 'p', ':', '/', '/', '/', 0x04, 0x08, 'l', 'd', 'a',
@@ -487,7 +487,7 @@ public class LdapResultTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 0x69, 0x15, // CHOICE { ..., addResponse AddResponse, ...
                 0x0A, 0x01, 0x0A, // resultCode success (Referral)
-                0x04, 0x00, // Empty matched DN
+                0x04, 0x00, // Empty matched Dn
                 0x04, 0x00, // Empty errorMessage
                 ( byte ) 0xA3, 0x0C, 0x04, 0x08, 'l', 'd', 'a', 'p', ':', '/', '/', '/', 0x04, 0x00 } );
 
@@ -569,7 +569,7 @@ public class LdapResultTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 0x69, 0x09, // CHOICE { ..., addResponse AddResponse, ...
                 0x0A, 0x01, 0x0A, // resultCode success (Referral)
-                0x04, 0x00, // Empty matched DN
+                0x04, 0x00, // Empty matched Dn
                 0x04, 0x00, // Empty errorMessage
                 ( byte ) 0xA3, 0x00, } );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.BindRequestImpl;
 import org.apache.directory.shared.ldap.message.LdapEncoder;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -171,7 +171,7 @@ public class BindRequestPerfTest
     @Ignore
     public void testEncodeBindRequestPerf() throws Exception
     {
-        DN name = new DN( "uid=akarasulu,dc=example,dc=com" );
+        Dn name = new Dn( "uid=akarasulu,dc=example,dc=com" );
         int nbLoops = 1000000;
         long t0 = System.currentTimeMillis();
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Sun Jan 23 01:17:06 2011
@@ -1318,7 +1318,7 @@ public class BindRequestTest
     @Test
     public void testPerf() throws Exception
     {
-        DN name = new DN( "uid=akarasulu,dc=example,dc=com" );
+        Dn name = new Dn( "uid=akarasulu,dc=example,dc=com" );
         long t0 = System.currentTimeMillis();
         
         for ( int i = 0; i< 10000; i++)

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java Sun Jan 23 01:17:06 2011
@@ -188,7 +188,7 @@ public class DelRequestTest
                 0x02, 0x01, 0x01, // messageID MessageID
                 // CHOICE { ..., delRequest DelRequest, ...
                 // DelRequest ::= [APPLICATION 10] LDAPDN;
-                0x4A, 0x00 // Empty DN
+                0x4A, 0x00 // Empty Dn
             } );
 
         stream.flip();

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/operations/CertGenerationRequestTest.java Sun Jan 23 01:17:06 2011
@@ -63,7 +63,7 @@ public class CertGenerationRequestTest
         int dnLen = dn.length();
 
         // start Tag + L is 2 bytes
-        // the same value of DN is used for all target,issuer and subject DNs so
+        // the same value of Dn is used for all target,issuer and subject DNs so
         // it is ( ( OCTET_STRING Tag + Len ) + dnLen ) * 3 
         // finally for keyAlgo ( OCTET_STRING Tag + Len ) + keyAlgoLen
 
@@ -185,8 +185,8 @@ public class CertGenerationRequestTest
 
         bb.put( new byte[]
             { 0x30, 0x09, // CertGenerateObject ::= SEQUENCE {
-              0x04, 0x04, 'c', 'n', '=', 'x', // target DN string 
-              0x04, 0x01, ' '} ); // empty issuer DN
+              0x04, 0x04, 'c', 'n', '=', 'x', // target Dn string
+              0x04, 0x01, ' '} ); // empty issuer Dn
 
         CertGenerationContainer container = new CertGenerationContainer();
         bb.flip();
@@ -206,8 +206,8 @@ public class CertGenerationRequestTest
 
         bb.put( new byte[]
                          { 0x30, 0x10, // CertGenerateObject ::= SEQUENCE {
-                           0x04, 0x04, 'c', 'n', '=', 'x', // target DN string 
-                           0x04, 0x02, '=', 'x' } ); // empty issuer DN
+                           0x04, 0x04, 'c', 'n', '=', 'x', // target Dn string
+                           0x04, 0x02, '=', 'x' } ); // empty issuer Dn
 
         bb.flip();
 
@@ -232,9 +232,9 @@ public class CertGenerationRequestTest
 
         bb.put( new byte[]
             { 0x30, 0x15, // CertGenerateObject ::= SEQUENCE {
-              0x04, 0x04, 'c', 'n', '=', 'x', // target DN string 
-              0x04, 0x04, 'c', 'n', '=', 'x', // issuer DN
-              0x04, 0x01, ' ' } ); // empty subject DN
+              0x04, 0x04, 'c', 'n', '=', 'x', // target Dn string
+              0x04, 0x04, 'c', 'n', '=', 'x', // issuer Dn
+              0x04, 0x01, ' ' } ); // empty subject Dn
 
         CertGenerationContainer container = new CertGenerationContainer();
         bb.flip();
@@ -254,16 +254,16 @@ public class CertGenerationRequestTest
 
         bb.put( new byte[]
                          { 0x30, 0x16, // CertGenerateObject ::= SEQUENCE {
-                           0x04, 0x04, 'c', 'n', '=', 'x', // target DN string 
-                           0x04, 0x04, 'c', 'n', '=', 'x', // issuer DN
-                           0x04, 0x02, '=', 'x' } ); // invalid subject DN
+                           0x04, 0x04, 'c', 'n', '=', 'x', // target Dn string
+                           0x04, 0x04, 'c', 'n', '=', 'x', // issuer Dn
+                           0x04, 0x02, '=', 'x' } ); // invalid subject Dn
 
         bb.flip();
 
         try
         {
             decoder.decode( bb, container );
-            fail( "shouldn't accept the invalid subject DN" );
+            fail( "shouldn't accept the invalid subject Dn" );
         }
         catch ( DecoderException e )
         {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Sun Jan 23 01:17:06 2011
@@ -135,7 +135,7 @@ public class ModifyDNRequestTest
 
 
     /**
-     * Test the decoding of a bad DN ModifyDNRequest
+     * Test the decoding of a bad Dn ModifyDNRequest
      */
     @Test
     public void testDecodeModifyDNRequestBadDN()
@@ -188,7 +188,7 @@ public class ModifyDNRequestTest
 
 
     /**
-     * Test the decoding of a bad RDN ModifyDNRequest
+     * Test the decoding of a bad Rdn ModifyDNRequest
      */
     @Test
     public void testDecodeModifyDNRequestBadRDN()
@@ -241,7 +241,7 @@ public class ModifyDNRequestTest
 
 
     /**
-     * Test the decoding of a bad RDN ModifyDNRequest
+     * Test the decoding of a bad Rdn ModifyDNRequest
      */
     @Test
     public void testDecodeModifyDNRequestBadNewSuperior()

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControl;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
-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.junit.Test;
 import org.junit.runner.RunWith;
@@ -350,7 +350,7 @@ public class EntryChangeControlTest
         EntryChangeControl entry = new EntryChangeControl();
         entry.setChangeType( ChangeType.MODDN );
         entry.setChangeNumber( 16 );
-        entry.setPreviousDn( new DN( "a=b" ) );
+        entry.setPreviousDn( new Dn( "a=b" ) );
         bb = entry.encode( ByteBuffer.allocate( entry.computeLength() ) );
         String decoded = Strings.dumpBytes(bb.array());
         assertEquals( expected, decoded );
@@ -387,7 +387,7 @@ public class EntryChangeControlTest
         EntryChangeControl entry = new EntryChangeControl();
         entry.setChangeType( ChangeType.MODDN );
         entry.setChangeNumber( 5124095576030430L );
-        entry.setPreviousDn( new DN( "a=b" ) );
+        entry.setPreviousDn( new Dn( "a=b" ) );
         bb = entry.encode( ByteBuffer.allocate( entry.computeLength() ) );
         String decoded = Strings.dumpBytes(bb.array());
         assertEquals( expected, decoded );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/entry/EntryTest.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.util.Strings;
@@ -60,7 +60,7 @@ import org.junit.runner.RunWith;
 @Concurrent()
 public class EntryTest
 {
-    private static DN EXAMPLE_DN;
+    private static Dn EXAMPLE_DN;
     private static final byte[] BYTES1 = new byte[]{ 'a', 'b' };
     private static final byte[] BYTES2 = new byte[]{ 'b' };
     private static final byte[] BYTES3 = new byte[]{ 'c' };
@@ -173,7 +173,7 @@ public class EntryTest
     @BeforeClass
     public static void setUpBeforeClass() throws Exception
     {
-        EXAMPLE_DN = new DN( "dc=example,dc=com" );
+        EXAMPLE_DN = new Dn( "dc=example,dc=com" );
 
         oids = new HashMap<String, OidNormalizer>();
 
@@ -204,13 +204,13 @@ public class EntryTest
         Entry entry = new DefaultEntry();
         
         assertNotNull( entry );
-        assertEquals( DN.EMPTY_DN, entry.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
     }
 
 
     /**
-     * Test method for DefaultEntry( DN )
+     * Test method for DefaultEntry( Dn )
      */
     @Test
     public void testDefaultClientEntryLdapDN()
@@ -225,7 +225,7 @@ public class EntryTest
 
 
     /**
-     * Test method for DefaultEntry( DN, String... )
+     * Test method for DefaultEntry( Dn, String... )
      */
     @Test
     public void testDefaultClientEntryLdapDNStringArray()
@@ -263,7 +263,7 @@ public class EntryTest
 
 
     /**
-     * Test method for DefaultEntry( DN, EntryAttribute... )
+     * Test method for DefaultEntry( Dn, EntryAttribute... )
      */
     @Test
     public void testDefaultClientEntryLdapDNEntryAttributeArray()
@@ -466,7 +466,7 @@ public class EntryTest
         assertEquals( entry1, entry2 );
         entry2.setDn( EXAMPLE_DN );
         
-        assertEquals( DN.EMPTY_DN, entry1.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry1.getDn() );
         
         entry1.setDn( EXAMPLE_DN );
         entry2 = entry1.clone();
@@ -716,7 +716,7 @@ public class EntryTest
         
         assertEquals( EXAMPLE_DN, entry.getDn() );
         
-        DN testDn = new DN( "cn=test" );
+        Dn testDn = new Dn( "cn=test" );
         entry.setDn( testDn );
         
         assertEquals( testDn, entry.getDn() );
@@ -734,7 +734,7 @@ public class EntryTest
         
         assertEquals( entry1.hashCode(), entry2.hashCode() );
         
-        entry2.setDn( new DN( "ou=system,dc=com" ) );
+        entry2.setDn( new Dn( "ou=system,dc=com" ) );
         assertNotSame( entry1.hashCode(), entry2.hashCode() );
         
         entry2.setDn( EXAMPLE_DN );
@@ -1194,14 +1194,14 @@ public class EntryTest
 
 
     /**
-     * Test method for setDN( DN )
+     * Test method for setDN( Dn )
      */
     @Test
     public void testSetDn()
     {
         Entry entry = new DefaultEntry();
         
-        assertEquals( DN.EMPTY_DN, entry.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry.getDn() );
         
         entry.setDn( EXAMPLE_DN );
         assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -1269,7 +1269,7 @@ public class EntryTest
     @Test
     public void testSerializeCompleteEntry() throws LdapException, IOException, ClassNotFoundException
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         
         dn.normalize( oids );
         
@@ -1286,7 +1286,7 @@ public class EntryTest
     
     
     /**
-     * Test the serialization of an entry with no DN
+     * Test the serialization of an entry with no Dn
      */
     @Test
     public void testSerializeEntryWithNoDN() throws LdapException, IOException, ClassNotFoundException
@@ -1304,7 +1304,7 @@ public class EntryTest
     
     
     /**
-     * Test the serialization of an entry with no attribute and no DN
+     * Test the serialization of an entry with no attribute and no Dn
      */
     @Test
     public void testSerializeEntryWithNoDNNoAttribute() throws LdapException, IOException, ClassNotFoundException
@@ -1323,7 +1323,7 @@ public class EntryTest
     @Test
     public void testSerializeEntryWithNoAttribute() throws LdapException, IOException, ClassNotFoundException
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         
         dn.normalize( oids );
         

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/LdapUrlTest.java Sun Jan 23 01:17:06 2011
@@ -34,9 +34,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.filter.LdapURL;
-import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.filter.LdapURL.Extension;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -437,7 +435,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a valid encoded DN
+     * test a LdapURL with a valid encoded Dn
      */
     @Test
     public void testDnSimpleDNEncoded() throws LdapURLEncodingException
@@ -448,7 +446,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with an invalid DN
+     * test a LdapURL with an invalid Dn
      */
     @Test
     public void testDnInvalidDN()
@@ -466,7 +464,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with an invalid DN 2
+     * test a LdapURL with an invalid Dn 2
      */
     @Test
     public void testDnInvalidDN2()
@@ -535,7 +533,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with attributes but no DN
+     * test a LdapURL with attributes but no Dn
      */
     @Test
     public void testLdapNoDNAttributes()
@@ -746,7 +744,7 @@ public class LdapUrlTest
         LdapURL url = new LdapURL();
         assertNull( url.getDn() );
 
-        DN dn = new DN( "dc=example,dc=com" );
+        Dn dn = new Dn( "dc=example,dc=com" );
         url.setDn( dn );
         assertEquals( dn, url.getDn() );
         assertEquals( "ldap:///dc=example,dc=com", url.toString() );
@@ -768,7 +766,7 @@ public class LdapUrlTest
         assertTrue( url.getAttributes().isEmpty() );
 
         List<String> attributes = new ArrayList<String>();
-        url.setDn( new DN( "dc=example,dc=com" ) );
+        url.setDn( new Dn( "dc=example,dc=com" ) );
 
         url.setAttributes( null );
         assertNotNull( url.getAttributes() );
@@ -798,7 +796,7 @@ public class LdapUrlTest
         LdapURL url = new LdapURL();
         assertEquals( SearchScope.OBJECT, url.getScope() );
 
-        url.setDn( new DN( "dc=example,dc=com" ) );
+        url.setDn( new Dn( "dc=example,dc=com" ) );
 
         url.setScope( SearchScope.ONELEVEL );
         assertEquals( SearchScope.ONELEVEL, url.getScope() );
@@ -823,7 +821,7 @@ public class LdapUrlTest
         LdapURL url = new LdapURL();
         assertNull( url.getFilter() );
 
-        url.setDn( new DN( "dc=example,dc=com" ) );
+        url.setDn( new Dn( "dc=example,dc=com" ) );
 
         url.setFilter( "(objectClass=person)" );
         assertEquals( "(objectClass=person)", url.getFilter() );
@@ -859,7 +857,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL without a host but with a DN
+     * test a LdapURL without a host but with a Dn
      *
      */
     @Test
@@ -880,7 +878,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a host, no port, and a DN
+     * test a LdapURL with a host, no port, and a Dn
      *
      */
     @Test
@@ -900,7 +898,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no host, a port, and a DN
+     * test a LdapURL with no host, a port, and a Dn
      *
      */
     @Test
@@ -920,7 +918,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN
+     * test a LdapURL with no Dn
      *
      */
     @Test
@@ -940,7 +938,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN and no attributes 
+     * test a LdapURL with no Dn and no attributes
      *
      */
     @Test
@@ -960,7 +958,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes and no scope 
+     * test a LdapURL with no Dn, no attributes and no scope
      *
      */
     @Test
@@ -980,7 +978,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, no scope and no filter 
+     * test a LdapURL with no Dn, no attributes, no scope and no filter
      *
      */
     @Test
@@ -1000,7 +998,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN and attributes
+     * test a LdapURL with no Dn and attributes
      *
      */
     @Test
@@ -1020,7 +1018,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN and attributes
+     * test a LdapURL with a Dn and attributes
      *
      */
     @Test
@@ -1040,7 +1038,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN and attributes
+     * test a LdapURL with no Dn and attributes
      *
      */
     @Test
@@ -1060,7 +1058,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes an scope
+     * test a LdapURL with no Dn, no attributes an scope
      *
      */
     @Test
@@ -1080,7 +1078,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes an scope base
+     * test a LdapURL with no Dn, no attributes an scope base
      *
      */
     @Test
@@ -1100,7 +1098,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes an default scope
+     * test a LdapURL with no Dn, no attributes an default scope
      *
      */
     @Test
@@ -1120,7 +1118,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes an scope
+     * test a LdapURL with a Dn, no attributes an scope
      *
      */
     @Test
@@ -1140,7 +1138,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes an scope base
+     * test a LdapURL with a Dn, no attributes an scope base
      *
      */
     @Test
@@ -1160,7 +1158,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes an default scope
+     * test a LdapURL with a Dn, no attributes an default scope
      *
      */
     @Test
@@ -1180,7 +1178,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes an scope
+     * test a LdapURL with no Dn, some attributes an scope
      *
      */
     @Test
@@ -1200,7 +1198,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes an scope base
+     * test a LdapURL with no Dn, some attributes an scope base
      *
      */
     @Test
@@ -1220,7 +1218,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes an default scope
+     * test a LdapURL with no Dn, some attributes an default scope
      *
      */
     @Test
@@ -1240,7 +1238,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes an scope
+     * test a LdapURL with a Dn, some attributes an scope
      *
      */
     @Test
@@ -1260,7 +1258,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes an scope base
+     * test a LdapURL with a Dn, some attributes an scope base
      *
      */
     @Test
@@ -1280,7 +1278,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes an default scope
+     * test a LdapURL with a Dn, some attributes an default scope
      *
      */
     @Test
@@ -1300,7 +1298,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, no scope and filter
+     * test a LdapURL with no Dn, no attributes, no scope and filter
      *
      */
     @Test
@@ -1320,7 +1318,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, no scope and filter
+     * test a LdapURL with a Dn, no attributes, no scope and filter
      *
      */
     @Test
@@ -1340,7 +1338,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, no scope and filter
+     * test a LdapURL with no Dn, some attributes, no scope and filter
      *
      */
     @Test
@@ -1360,7 +1358,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a scope and filter
+     * test a LdapURL with no Dn, no attributes, a scope and filter
      *
      */
     @Test
@@ -1380,7 +1378,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a base scope, and filter
+     * test a LdapURL with no Dn, no attributes, a base scope, and filter
      *
      */
     @Test
@@ -1400,7 +1398,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a scope and filter
+     * test a LdapURL with no Dn, some attributes, a scope and filter
      *
      */
     @Test
@@ -1420,7 +1418,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a base scope, and filter
+     * test a LdapURL with no Dn, some attributes, a base scope, and filter
      *
      */
     @Test
@@ -1440,7 +1438,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a scope and filter
+     * test a LdapURL with a Dn, no attributes, a scope and filter
      *
      */
     @Test
@@ -1460,7 +1458,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a base scope, and filter
+     * test a LdapURL with a Dn, no attributes, a base scope, and filter
      *
      */
     @Test
@@ -1480,7 +1478,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, no scope and filter
+     * test a LdapURL with a Dn, some attributes, no scope and filter
      *
      */
     @Test
@@ -1500,7 +1498,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a scope and filter
+     * test a LdapURL with a Dn, some attributes, a scope and filter
      *
      */
     @Test
@@ -1520,7 +1518,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a base scope, and filter
+     * test a LdapURL with a Dn, some attributes, a base scope, and filter
      *
      */
     @Test
@@ -1540,7 +1538,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, no scope, no filter and no extension 
+     * test a LdapURL with no Dn, no attributes, no scope, no filter and no extension
      *
      */
     @Test
@@ -1560,7 +1558,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, no scope, no filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, no scope, no filter and some extensions
      *
      */
     @Test
@@ -1580,7 +1578,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, no scope, a filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, no scope, a filter and some extensions
      *
      */
     @Test
@@ -1600,7 +1598,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a scope, no filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, a scope, no filter and some extensions
      *
      */
     @Test
@@ -1620,7 +1618,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a base scope, no filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, a base scope, no filter and some extensions
      *
      */
     @Test
@@ -1640,7 +1638,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a scope, a filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, a scope, a filter and some extensions
      *
      */
     @Test
@@ -1660,7 +1658,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, no attributes, a base scope, a filter and some extensions 
+     * test a LdapURL with no Dn, no attributes, a base scope, a filter and some extensions
      *
      */
     @Test
@@ -1680,7 +1678,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, no scope, no filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, no scope, no filter and some extensions
      *
      */
     @Test
@@ -1700,7 +1698,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, no scope, a filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, no scope, a filter and some extensions
      *
      */
     @Test
@@ -1720,7 +1718,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a scope, no filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, a scope, no filter and some extensions
      *
      */
     @Test
@@ -1740,7 +1738,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a base scope, no filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, a base scope, no filter and some extensions
      *
      */
     @Test
@@ -1760,7 +1758,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a scope, a filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, a scope, a filter and some extensions
      *
      */
     @Test
@@ -1780,7 +1778,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with no DN, some attributes, a base scope, a filter and some extensions 
+     * test a LdapURL with no Dn, some attributes, a base scope, a filter and some extensions
      *
      */
     @Test
@@ -1800,7 +1798,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, no scope, no filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, no scope, no filter and some extensions
      *
      */
     @Test
@@ -1820,7 +1818,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, no scope, a filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, no scope, a filter and some extensions
      *
      */
     @Test
@@ -1840,7 +1838,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a scope, no filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, a scope, no filter and some extensions
      *
      */
     @Test
@@ -1860,7 +1858,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a base scope, no filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, a base scope, no filter and some extensions
      *
      */
     @Test
@@ -1880,7 +1878,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a scope, a filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, a scope, a filter and some extensions
      *
      */
     @Test
@@ -1900,7 +1898,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, no attributes, a base scope, a filter and some extensions 
+     * test a LdapURL with a Dn, no attributes, a base scope, a filter and some extensions
      *
      */
     @Test
@@ -1920,7 +1918,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, no scope, no filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, no scope, no filter and some extensions
      *
      */
     @Test
@@ -1940,7 +1938,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, no scope, a filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, no scope, a filter and some extensions
      *
      */
     @Test
@@ -1960,7 +1958,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a scope, no filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, a scope, no filter and some extensions
      *
      */
     @Test
@@ -1980,7 +1978,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a base scope, no filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, a base scope, no filter and some extensions
      *
      */
     @Test
@@ -2000,7 +1998,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a scope, a filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, a scope, a filter and some extensions
      *
      */
     @Test
@@ -2020,7 +2018,7 @@ public class LdapUrlTest
 
 
     /**
-     * test a LdapURL with a DN, some attributes, a base scope, a filter and some extensions 
+     * test a LdapURL with a Dn, some attributes, a base scope, a filter and some extensions
      *
      */
     @Test
@@ -2118,7 +2116,7 @@ public class LdapUrlTest
         LdapURL url1 = new LdapURL();
         url1.setHost( "localhost" );
         url1.setPort( 123 );
-        url1.setDn( DN.EMPTY_DN );
+        url1.setDn( Dn.EMPTY_DN );
         url1.getExtensions().add( new Extension( false, "X-CONNECTION-NAME", germanChars ) );
         assertEquals( "ldap://localhost:123/????X-CONNECTION-NAME=%c3%84%c3%96%c3%9c%c3%9f%c3%a4%c3%b6%c3%bc", url1
             .toString() );
@@ -2140,7 +2138,7 @@ public class LdapUrlTest
         LdapURL url1 = new LdapURL();
         url1.setHost( "localhost" );
         url1.setPort( 123 );
-        url1.setDn( DN.EMPTY_DN );
+        url1.setDn( Dn.EMPTY_DN );
         url1.getExtensions().add( new Extension( false, "X-CONNECTION-NAME", "," ) );
         assertEquals( "ldap://localhost:123/????X-CONNECTION-NAME=%2c", url1.toString() );
 
@@ -2167,7 +2165,7 @@ public class LdapUrlTest
         LdapURL url1 = new LdapURL();
         url1.setHost( "localhost" );
         url1.setPort( 123 );
-        url1.setDn( DN.EMPTY_DN );
+        url1.setDn( Dn.EMPTY_DN );
         url1.getExtensions().add( new Extension( false, "X-CONNECTION-NAME", ":/?#[]@!$&'()*+,;=" ) );
         assertEquals( "ldap://localhost:123/????X-CONNECTION-NAME=:/%3f#[]@!$&'()*+%2c;=", url1.toString() );
 
@@ -2188,7 +2186,7 @@ public class LdapUrlTest
         LdapURL url1 = new LdapURL();
         url1.setHost( "localhost" );
         url1.setPort( 123 );
-        url1.setDn( DN.EMPTY_DN );
+        url1.setDn( Dn.EMPTY_DN );
         url1.getExtensions().add(
             new Extension( false, "X-CONNECTION-NAME",
                 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~" ) );



Mime
View raw message