directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918760 - in /directory/clients/ldap/trunk: ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/ ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ ldap-client-test/src/test/java/org/apache/directory/...
Date Wed, 03 Mar 2010 23:10:48 GMT
Author: elecharny
Date: Wed Mar  3 23:10:47 2010
New Revision: 918760

URL: http://svn.apache.org/viewvc?rev=918760&view=rev
Log:
Renaming LdapDN to DN (and all the associated classes)

Modified:
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/BindRequest.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/CompareRequest.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/DeleteRequest.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyDnRequest.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchResultEntry.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientSearchRequestTest.java

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
Wed Mar  3 23:10:47 2010
@@ -126,7 +126,7 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
@@ -1045,7 +1045,7 @@
      * @param credentials The password. It can't be null 
      * @return The BindResponse LdapResponse 
      */
-    public BindResponse bind( LdapDN name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( DN name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -1074,7 +1074,7 @@
      * @param credentials The password. It can't be null 
      * @return The BindResponse LdapResponse 
      */
-    public BindFuture bindAsync( LdapDN name, String credentials ) throws LdapException,
IOException
+    public BindFuture bindAsync( DN name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -1184,7 +1184,7 @@
         // Set the name
         try
         {
-            LdapDN dn = new LdapDN( searchRequest.getBaseDn() );
+            DN dn = new DN( searchRequest.getBaseDn() );
             request.setBaseObject( dn );
         }
         catch ( InvalidNameException ine )
@@ -1273,7 +1273,7 @@
         // Set the name
         try
         {
-            LdapDN dn = new LdapDN( bindRequest.getName() );
+            DN dn = new DN( bindRequest.getName() );
             bindRequestCodec.setName( dn );
         }
         catch ( InvalidNameException ine )
@@ -2135,22 +2135,22 @@
 
     /**
      * renames the given entryDn with new RDN and deletes the old RDN.
-     * @see #rename(LdapDN, RDN, boolean)
+     * @see #rename(DN, RDN, boolean)
      */
-    public ModifyDnResponse rename( LdapDN entryDn, RDN newRdn ) throws LdapException
+    public ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
     {
         return rename( entryDn, newRdn, true );
     }
 
 
     /**
-     * @see #rename(LdapDN, RDN, boolean)
+     * @see #rename(DN, RDN, boolean)
      */
     public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn )
throws LdapException
     {
         try
         {
-            return rename( new LdapDN( entryDn ), new RDN( newRdn ), deleteOldRdn );
+            return rename( new DN( entryDn ), new RDN( newRdn ), deleteOldRdn );
         }
         catch ( InvalidNameException e )
         {
@@ -2171,7 +2171,7 @@
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public ModifyDnResponse rename( LdapDN entryDn, RDN newRdn, boolean deleteOldRdn ) throws
LdapException
+    public ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws
LdapException
     {
         ModifyDnRequest modDnRequest = new ModifyDnRequest();
         modDnRequest.setEntryDn( entryDn );
@@ -2183,13 +2183,13 @@
 
 
     /**
-     * @see #move(LdapDN, LdapDN) 
+     * @see #move(DN, DN) 
      */
     public ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException
     {
         try
         {
-            return move( new LdapDN( entryDn ), new LdapDN( newSuperiorDn ) );
+            return move( new DN( entryDn ), new DN( newSuperiorDn ) );
         }
         catch ( InvalidNameException e )
         {
@@ -2207,7 +2207,7 @@
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public ModifyDnResponse move( LdapDN entryDn, LdapDN newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
     {
         ModifyDnRequest modDnRequest = new ModifyDnRequest();
         modDnRequest.setEntryDn( entryDn );
@@ -2361,7 +2361,7 @@
     {
         try
         {
-            DeleteRequest deleteRequest = new DeleteRequest( new LdapDN( dn ) );
+            DeleteRequest deleteRequest = new DeleteRequest( new DN( dn ) );
 
             return delete( deleteRequest );
         }
@@ -2379,7 +2379,7 @@
      * @param dn the target entry's DN
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public DeleteResponse delete( LdapDN dn ) throws LdapException
+    public DeleteResponse delete( DN dn ) throws LdapException
     {
         DeleteRequest deleteRequest = new DeleteRequest( dn );
 
@@ -2394,7 +2394,7 @@
      * @return operation's response
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public DeleteResponse deleteTree( LdapDN dn ) throws LdapException
+    public DeleteResponse deleteTree( DN dn ) throws LdapException
     {
         String treeDeleteOid = "1.2.840.113556.1.4.805";
 
@@ -2426,11 +2426,11 @@
         try
         {
             String treeDeleteOid = "1.2.840.113556.1.4.805";
-            LdapDN ldapDn = new LdapDN( dn );
+            DN newDn = new DN( dn );
 
             if ( isControlSupported( treeDeleteOid ) )
             {
-                DeleteRequest delRequest = new DeleteRequest( ldapDn );
+                DeleteRequest delRequest = new DeleteRequest( newDn );
                 delRequest.add( new ControlImpl( treeDeleteOid ) );
                 return delete( delRequest );
             }
@@ -2454,7 +2454,7 @@
      * removes all child entries present under the given DN and finally the DN itself
      * 
      * Working:
-     *          This is a recursive function which maintains a Map<LdapDN,Cursor>.
+     *          This is a recursive function which maintains a Map<DN,Cursor>.
      *          The way the cascade delete works is by checking for children for a 
      *          given DN(i.e opening a search cursor) and if the cursor is empty
      *          then delete the DN else for each entry's DN present in cursor call
@@ -2481,7 +2481,7 @@
      * @param listener  the delete operation response listener 
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    private DeleteResponse deleteRecursive( LdapDN dn, Map<LdapDN, Cursor<SearchResponse>>
cursorMap,
+    private DeleteResponse deleteRecursive( DN dn, Map<DN, Cursor<SearchResponse>>
cursorMap,
         DeleteListener listener ) throws LdapException
     {
         LOG.debug( "searching for {}", dn.getName() );
@@ -2492,7 +2492,7 @@
         {
             if ( cursorMap == null )
             {
-                cursorMap = new HashMap<LdapDN, Cursor<SearchResponse>>();
+                cursorMap = new HashMap<DN, Cursor<SearchResponse>>();
             }
 
             cursor = cursorMap.get( dn );
@@ -2668,7 +2668,7 @@
         try
         {
             CompareRequest compareRequest = new CompareRequest();
-            compareRequest.setEntryDn( new LdapDN( dn ) );
+            compareRequest.setEntryDn( new DN( dn ) );
             compareRequest.setAttrName( attributeName );
             compareRequest.setValue( value );
 
@@ -2697,7 +2697,7 @@
         try
         {
             CompareRequest compareRequest = new CompareRequest();
-            compareRequest.setEntryDn( new LdapDN( dn ) );
+            compareRequest.setEntryDn( new DN( dn ) );
             compareRequest.setAttrName( attributeName );
             compareRequest.setValue( value );
 
@@ -2726,7 +2726,7 @@
         try
         {
             CompareRequest compareRequest = new CompareRequest();
-            compareRequest.setEntryDn( new LdapDN( dn ) );
+            compareRequest.setEntryDn( new DN( dn ) );
             compareRequest.setAttrName( attributeName );
             compareRequest.setValue( value );
 
@@ -2750,7 +2750,7 @@
      * @return compare operation's response
      * @throws LdapException
      */
-    public CompareResponse compare( LdapDN dn, String attributeName, String value ) throws
LdapException
+    public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );
@@ -2771,7 +2771,7 @@
      * @return compare operation's response
      * @throws LdapException
      */
-    public CompareResponse compare( LdapDN dn, String attributeName, byte[] value ) throws
LdapException
+    public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );
@@ -2792,7 +2792,7 @@
      * @return compare operation's response
      * @throws LdapException
      */
-    public CompareResponse compare( LdapDN dn, String attributeName, Value<?> value
) throws LdapException
+    public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws
LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/BindRequest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/BindRequest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/BindRequest.java
Wed Mar  3 23:10:47 2010
@@ -107,7 +107,7 @@
      * 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.
      */
@@ -122,7 +122,7 @@
      * 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.

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/CompareRequest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/CompareRequest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/CompareRequest.java
Wed Mar  3 23:10:47 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.ldap.client.api.message;
 
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -33,18 +33,18 @@
 public class CompareRequest extends AbstractRequest implements RequestWithResponse, AbandonableRequest
 {
     /** the target entry's DN */
-    private LdapDN entryDn;
+    private DN entryDn;
     
     private String attrName;
     
     private Object value;
 
-    public LdapDN getEntryDn()
+    public DN getEntryDn()
     {
         return entryDn;
     }
 
-    public void setEntryDn( LdapDN dn )
+    public void setEntryDn( DN dn )
     {
         this.entryDn = dn;
     }

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/DeleteRequest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/DeleteRequest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/DeleteRequest.java
Wed Mar  3 23:10:47 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.ldap.client.api.message;
 
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -33,13 +33,13 @@
 public class DeleteRequest extends AbstractRequest implements RequestWithResponse, AbandonableRequest
 {
     /** the DN to be deleted */
-    private LdapDN targetDn;
+    private DN targetDn;
 
     /** flag to tell whether to delete all the children under the target DN */
     private boolean deleteChildren;
 
 
-    public DeleteRequest( LdapDN targetDn )
+    public DeleteRequest( DN targetDn )
     {
         super();
         this.targetDn = targetDn;
@@ -58,7 +58,7 @@
     }
 
 
-    public LdapDN getTargetDn()
+    public DN getTargetDn()
     {
         return targetDn;
     }

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyDnRequest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyDnRequest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyDnRequest.java
Wed Mar  3 23:10:47 2010
@@ -21,7 +21,7 @@
 package org.apache.directory.ldap.client.api.message;
 
 
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
 
@@ -34,13 +34,13 @@
 public class ModifyDnRequest extends AbstractRequest implements RequestWithResponse, AbandonableRequest
 {
     /** the entry's DN to be changed */
-    private LdapDN entryDn;
+    private DN entryDn;
 
     /** the new RDN */
     private RDN newRdn;
 
     /** target entry's new parent DN */
-    private LdapDN newSuperior;
+    private DN newSuperior;
 
     /** flag to indicate whether to delete the old RDN */
     private boolean deleteOldRdn = false;
@@ -52,13 +52,13 @@
     }
 
 
-    public LdapDN getEntryDn()
+    public DN getEntryDn()
     {
         return entryDn;
     }
 
 
-    public void setEntryDn( LdapDN entryDn )
+    public void setEntryDn( DN entryDn )
     {
         this.entryDn = entryDn;
     }
@@ -76,13 +76,13 @@
     }
 
 
-    public LdapDN getNewSuperior()
+    public DN getNewSuperior()
     {
         return newSuperior;
     }
 
 
-    public void setNewSuperior( LdapDN newSuperior )
+    public void setNewSuperior( DN newSuperior )
     {
         this.newSuperior = newSuperior;
     }

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/ModifyRequest.java
Wed Mar  3 23:10:47 2010
@@ -29,7 +29,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;
 
 
 /**
@@ -41,7 +41,7 @@
 public class ModifyRequest extends AbstractRequest implements RequestWithResponse, AbandonableRequest
 {
     /** DN of the target Entry to be modified */
-    private LdapDN dn;
+    private DN dn;
 
     /** modifications list */
     private List<Modification> mods = new ArrayList<Modification>();
@@ -53,7 +53,7 @@
      *
      * @param dn DN of the Entry to be modified 
      */
-    public ModifyRequest( LdapDN dn )
+    public ModifyRequest( DN dn )
     {
         super();
         this.dn = dn;
@@ -188,7 +188,7 @@
     /**
      * @return the target entry's DN
      */
-    public LdapDN getDn()
+    public DN getDn()
     {
         return dn;
     }

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchResultEntry.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchResultEntry.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/message/SearchResultEntry.java
Wed Mar  3 23:10:47 2010
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -51,7 +51,7 @@
      * 
      * @return the Dn of the entry returned.
      */
-    public LdapDN getObjectName()
+    public DN getObjectName()
     {
         if ( entry != null )
         {
@@ -59,7 +59,7 @@
         }
         else
         {
-            return LdapDN.EMPTY_LDAPDN;
+            return DN.EMPTY_DN;
         }
     }
 

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
Wed Mar  3 23:10:47 2010
@@ -46,7 +46,7 @@
 import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -141,7 +141,7 @@
     {
         LdapConnection connection = new LdapConnection( config );
 
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
         connection.bind( dn.getName(), "secret" );
         
         List<String> controlList = connection.getSupportedControls();

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -72,7 +72,7 @@
     public void setup() throws Exception
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.setTimeOut( 0L );
         connection.bind( bindDn.getName(), "secret" );
 
@@ -110,7 +110,7 @@
         for ( int i = 0; i < numEntries; i++ )
         {
             String s = String.valueOf( i );
-            LdapDN dn = new LdapDN( "cn=" + s + ",ou=system" );
+            DN dn = new DN( "cn=" + s + ",ou=system" );
             Entry entry = new DefaultClientEntry( dn );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
             entry.add( SchemaConstants.CN_AT, s );

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -42,7 +42,7 @@
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,7 +70,7 @@
     public void setup() throws Exception
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         session = ldapServer.getDirectoryService().getSession();
@@ -100,7 +100,7 @@
     @Test
     public void testAdd() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=testadd,ou=system" );
+        DN dn = new DN( "cn=testadd,ou=system" );
         Entry entry = new DefaultClientEntry( dn ); 
         entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
         entry.add( SchemaConstants.CN_AT, "testadd_cn" );
@@ -119,7 +119,7 @@
     @Test
     public void testAddAsync() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=testAsyncAdd,ou=system" );
+        DN dn = new DN( "cn=testAsyncAdd,ou=system" );
         Entry entry = new DefaultClientEntry( dn ); 
         entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
         entry.add( SchemaConstants.CN_AT, "testAsyncAdd_cn" );

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,7 +68,7 @@
     public void setup() throws Exception
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         session = ldapServer.getDirectoryService().getSession();
@@ -98,7 +98,7 @@
     @Test
     public void testCompare() throws Exception
     {
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
         
         CompareResponse response = connection.compare( dn, SchemaConstants.UID_AT, "admin"
);
         assertNotNull( response );
@@ -113,7 +113,7 @@
     @Test
     public void testCompareAsync() throws Exception
     {
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
 
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -45,7 +45,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -111,7 +111,7 @@
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
 
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -141,7 +141,7 @@
     @Test
     public void testDeleteLeafNode() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
+        DN dn = new DN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
         
         assertTrue( session.exists( dn ) );
         
@@ -156,7 +156,7 @@
     @Test
     public void testDeleteNonLeafFailure() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=child1,cn=parent,ou=system" ); // has children
+        DN dn = new DN( "cn=child1,cn=parent,ou=system" ); // has children
         assertTrue( session.exists( dn ) );
  
         DeleteResponse response = connection.delete( dn.getName() );
@@ -171,7 +171,7 @@
     @Ignore
     public void testDeleteWithCascadeControl() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=parent,ou=system" );
+        DN dn = new DN( "cn=parent,ou=system" );
         
         assertTrue( session.exists( dn ) );
         
@@ -201,11 +201,11 @@
     @Ignore
     public void testDeleteWithoutCascadeControl() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=parent,ou=system" );
+        DN dn = new DN( "cn=parent,ou=system" );
         
         assertTrue( session.exists( dn ) );
 
-        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive",
LdapDN.class, Map.class, DeleteListener.class );
+        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive",
DN.class, Map.class, DeleteListener.class );
         deleteChildrenMethod.setAccessible( true );
         
         DeleteResponse response = ( DeleteResponse ) deleteChildrenMethod.invoke( connection,
dn, null, null );
@@ -223,11 +223,11 @@
     @Ignore
     public void testDeleteAsyncWithoutCascadeControl() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=parent,ou=system" );
+        DN dn = new DN( "cn=parent,ou=system" );
         
         assertTrue( session.exists( dn ) );
 
-        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive",
LdapDN.class, Map.class, DeleteListener.class );
+        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive",
DN.class, Map.class, DeleteListener.class );
         deleteChildrenMethod.setAccessible( true );
     
         final AtomicInteger count = new AtomicInteger();
@@ -257,7 +257,7 @@
     @Test
     public void testDeleteAsync() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
+        DN dn = new DN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
         
         assertTrue( session.exists( dn ) );
         

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +73,7 @@
    public void setup() throws Exception
    {
        connection = new LdapConnection( "localhost", ldapServer.getPort() );
-       LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+       DN bindDn = new DN( "uid=admin,ou=system" );
        connection.bind( bindDn.getName(), "secret" );
 
        session = ldapServer.getDirectoryService().getSession();

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
-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.junit.After;
 import org.junit.Before;
@@ -78,7 +78,7 @@
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
 
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -110,8 +110,8 @@
     {
         ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString" );
         assertNotNull( resp );
-        assertFalse( session.exists( new LdapDN( dn ) ) );
-        assertTrue( session.exists( new LdapDN( "cn=modifyDnWithString,ou=system" ) ) );
+        assertFalse( session.exists( new DN( dn ) ) );
+        assertTrue( session.exists( new DN( "cn=modifyDnWithString,ou=system" ) ) );
     }
     
     
@@ -121,10 +121,10 @@
         ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString", false );
         assertNotNull( resp );
         
-        LdapDN oldDn = new LdapDN( dn );
+        DN oldDn = new DN( dn );
         assertFalse( session.exists( oldDn ) );
         
-        Entry entry = session.lookup( new LdapDN( "cn=modifyDnWithString,ou=system" ) );
+        Entry entry = session.lookup( new DN( "cn=modifyDnWithString,ou=system" ) );
         assertNotNull( entry );
         
         RDN oldRdn = oldDn.getRdn();
@@ -138,18 +138,18 @@
         ModifyDnResponse resp = connection.move( dn, "ou=users,ou=system" );
         assertNotNull( resp );
         
-        LdapDN oldDn = new LdapDN( dn );
+        DN oldDn = new DN( dn );
         assertFalse( session.exists( oldDn ) );
         
-        assertTrue( session.exists( new LdapDN( "cn=modDn,ou=users,ou=system" ) ) );
+        assertTrue( session.exists( new DN( "cn=modDn,ou=users,ou=system" ) ) );
     }
     
     
     @Test
     public void testModifyDnAsync() throws Exception
     {
-        LdapDN oldDn = new LdapDN( dn );
-        LdapDN newDn = new LdapDN( "cn=modifyDnWithString,ou=system" );
+        DN oldDn = new DN( dn );
+        DN newDn = new DN( "cn=modifyDnWithString,ou=system" );
 
         ModifyDnRequest modDnReq = new ModifyDnRequest();
         modDnReq.setEntryDn( oldDn );
@@ -173,6 +173,6 @@
             fail();
         }
 
-        assertTrue( session.exists( new LdapDN( "cn=modifyDnWithString,ou=system" ) ) );
+        assertTrue( session.exists( new DN( "cn=modifyDnWithString,ou=system" ) ) );
     }
 }

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -42,7 +42,7 @@
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -73,7 +73,7 @@
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
 
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -103,7 +103,7 @@
     @Test
     public void testModify() throws Exception
     {
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
 
         String expected = String.valueOf( System.currentTimeMillis() );
         ModifyRequest modRequest = new ModifyRequest( dn );
@@ -122,7 +122,7 @@
     @Test
     public void testModifyWithEntry() throws Exception
     {
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
         
         Entry entry = new DefaultClientEntry( dn );
         
@@ -148,7 +148,7 @@
     @Test
     public void modifyAsync() throws Exception
     {
-        LdapDN dn = new LdapDN( "uid=admin,ou=system" );
+        DN dn = new DN( "uid=admin,ou=system" );
 
         String expected = String.valueOf( System.currentTimeMillis() );
         ModifyRequest modRequest = new ModifyRequest( dn );

Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientSearchRequestTest.java?rev=918760&r1=918759&r2=918760&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientSearchRequestTest.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientSearchRequestTest.java
Wed Mar  3 23:10:47 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -83,7 +83,7 @@
     public void setup() throws Exception
     {
         connection = new LdapConnection( "localhost", ldapServer.getPort() );
-        LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
+        DN bindDn = new DN( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
     }
 



Mime
View raw message