directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985495 [5/7] - in /directory: apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/ apacheds/...
Date Sat, 14 Aug 2010 14:18:55 GMT
Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Sat Aug 14 14:18:49 2010
@@ -21,14 +21,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -83,7 +83,7 @@ public interface LdapConnection
      * @param entry The entry to add
      * @result the add operation's response
      */
-    public abstract InternalAddResponse add( Entry entry ) throws LdapException;
+    public abstract AddResponse add( Entry entry ) throws LdapException;
 
 
     /**
@@ -93,7 +93,7 @@ public interface LdapConnection
      * @return the add operation's response
      * @throws LdapException
      */
-    public abstract InternalAddResponse add( AddRequest addRequest ) throws LdapException;
+    public abstract AddResponse add( AddRequest addRequest ) throws LdapException;
 
 
     /**
@@ -122,7 +122,7 @@ public interface LdapConnection
      *
      * @return The BindResponse LdapResponse
      */
-    public abstract InternalBindResponse bind() throws LdapException, IOException;
+    public abstract BindResponse bind() throws LdapException, IOException;
 
 
     /**
@@ -133,7 +133,7 @@ public interface LdapConnection
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      */
-    public abstract InternalBindResponse bind( String name, String credentials ) throws LdapException, IOException;
+    public abstract BindResponse bind( String name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -144,7 +144,7 @@ public interface LdapConnection
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      */
-    public abstract InternalBindResponse bind( DN name, String credentials ) throws LdapException, IOException;
+    public abstract BindResponse bind( DN name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -154,7 +154,7 @@ public interface LdapConnection
      * parameters
      * @return A LdapResponse containing the result
      */
-    public abstract InternalBindResponse bind( BindRequest bindRequest ) throws LdapException, IOException;
+    public abstract BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException;
 
 
     /**
@@ -174,7 +174,7 @@ public interface LdapConnection
      * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE
      * @return A cursor on the result.
      */
-    public abstract Cursor<InternalResponse> search( DN baseDn, String filter, SearchScope scope, String... attributes )
+    public abstract Cursor<Response> search( DN baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException;
 
 
@@ -195,7 +195,7 @@ public interface LdapConnection
      * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE
      * @return A cursor on the result.
      */
-    public abstract Cursor<InternalResponse> search( String baseDn, String filter, SearchScope scope,
+    public abstract Cursor<Response> search( String baseDn, String filter, SearchScope scope,
         String... attributes ) throws LdapException;
 
 
@@ -206,7 +206,7 @@ public interface LdapConnection
      * @return A {@link Cursor} containing Entries and Referencs
      * @throws LdapException @TODO
      */
-    public abstract Cursor<InternalResponse> search( SearchRequest searchRequest ) throws LdapException;
+    public abstract Cursor<Response> search( SearchRequest searchRequest ) throws LdapException;
 
 
     //------------------------ The LDAP operations ------------------------//
@@ -236,7 +236,7 @@ public interface LdapConnection
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract InternalModifyResponse modify( DN dn, Modification... modifications ) throws LdapException;
+    public abstract ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException;
 
 
     /**
@@ -248,7 +248,7 @@ public interface LdapConnection
     * @return the modify operation's response
     * @throws LdapException in case of modify operation failure or timeout happens
     */
-    public abstract InternalModifyResponse modify( String dn, Modification... modifications ) throws LdapException;
+    public abstract ModifyResponse modify( String dn, Modification... modifications ) throws LdapException;
 
 
     /**
@@ -260,7 +260,7 @@ public interface LdapConnection
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract InternalModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException;
+    public abstract ModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException;
 
 
     /**
@@ -271,27 +271,27 @@ public interface LdapConnection
      * @return the modify operation's r"esponse
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract InternalModifyResponse modify( ModifyRequest modRequest ) throws LdapException;
+    public abstract ModifyResponse modify( ModifyRequest modRequest ) throws LdapException;
 
 
     /**
      * renames the given entryDn with new Rdn and deletes the old RDN.
      * @see #rename(String, String, boolean)
      */
-    public abstract InternalModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException;
+    public abstract ModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException;
 
 
     /**
      * renames the given entryDn with new RDN and deletes the old RDN.
      * @see #rename(DN, RDN, boolean)
      */
-    public abstract InternalModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException;
+    public abstract ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException;
 
 
     /**
      * @see #rename(DN, RDN, boolean)
      */
-    public abstract InternalModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn )
+    public abstract ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn )
         throws LdapException;
 
 
@@ -306,14 +306,14 @@ public interface LdapConnection
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public abstract InternalModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn )
+    public abstract ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn )
         throws LdapException;
 
 
     /**
      * @see #move(DN, DN)
      */
-    public abstract InternalModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException;
+    public abstract ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException;
 
 
     /**
@@ -324,7 +324,7 @@ public interface LdapConnection
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public abstract InternalModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException;
+    public abstract ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException;
 
 
     /**
@@ -332,7 +332,7 @@ public interface LdapConnection
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public abstract InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException;
+    public abstract ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException;
 
 
     /**
@@ -340,7 +340,7 @@ public interface LdapConnection
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public abstract InternalModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException;
+    public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException;
 
 
     /**
@@ -350,7 +350,7 @@ public interface LdapConnection
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public abstract InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn )
+    public abstract ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn )
         throws LdapException;
 
 
@@ -361,7 +361,7 @@ public interface LdapConnection
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public abstract InternalModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
+    public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
         throws LdapException;
 
 
@@ -373,7 +373,7 @@ public interface LdapConnection
      * @return modifyDn operations response, null if non-null listener is provided
      * @throws LdapException
      */
-    public abstract InternalModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException;
+    public abstract ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException;
 
 
     /**
@@ -382,7 +382,7 @@ public interface LdapConnection
      * @param dn the target entry's DN as a String
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract InternalDeleteResponse delete( String dn ) throws LdapException;
+    public abstract DeleteResponse delete( String dn ) throws LdapException;
 
 
     /**
@@ -391,7 +391,7 @@ public interface LdapConnection
      * @param dn the target entry's DN
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract InternalDeleteResponse delete( DN dn ) throws LdapException;
+    public abstract DeleteResponse delete( DN dn ) throws LdapException;
 
 
     /**
@@ -401,7 +401,7 @@ public interface LdapConnection
      * @return delete operation's response, null if a non-null listener value is provided
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract InternalDeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
+    public abstract DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
 
 
     /**
@@ -414,7 +414,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( String dn, String attributeName, String value )
+    public abstract CompareResponse compare( String dn, String attributeName, String value )
         throws LdapException;
 
 
@@ -428,7 +428,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( String dn, String attributeName, byte[] value )
+    public abstract CompareResponse compare( String dn, String attributeName, byte[] value )
         throws LdapException;
 
 
@@ -442,7 +442,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( String dn, String attributeName, Value<?> value )
+    public abstract CompareResponse compare( String dn, String attributeName, Value<?> value )
         throws LdapException;
 
 
@@ -456,7 +456,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( DN dn, String attributeName, String value ) throws LdapException;
+    public abstract CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException;
 
 
     /**
@@ -469,7 +469,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException;
+    public abstract CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException;
 
 
     /**
@@ -482,7 +482,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException;
+    public abstract CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException;
 
 
     /**
@@ -492,25 +492,25 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract InternalCompareResponse compare( CompareRequest compareRequest ) throws LdapException;
+    public abstract CompareResponse compare( CompareRequest compareRequest ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract InternalExtendedResponse extended( String oid ) throws LdapException;
+    public abstract ExtendedResponse extended( String oid ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract InternalExtendedResponse extended( String oid, byte[] value ) throws LdapException;
+    public abstract ExtendedResponse extended( String oid, byte[] value ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract InternalExtendedResponse extended( OID oid ) throws LdapException;
+    public abstract ExtendedResponse extended( OID oid ) throws LdapException;
 
 
     /**
@@ -521,7 +521,7 @@ public interface LdapConnection
      * @return extended operation's response
      * @throws LdapException
      */
-    public abstract InternalExtendedResponse extended( OID oid, byte[] value ) throws LdapException;
+    public abstract ExtendedResponse extended( OID oid, byte[] value ) throws LdapException;
 
 
     /**
@@ -531,19 +531,19 @@ public interface LdapConnection
      * @return Extended operation's response
      * @throws LdapException If the DN is not valid or if the extended operation failed
      */
-    public abstract InternalExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
+    public abstract ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
 
 
     /**
      * @see #lookup(DN, String...)
      */
-    public abstract InternalResponse lookup( DN dn ) throws LdapException;
+    public abstract Response lookup( DN dn ) throws LdapException;
 
 
     /**
      * @see #lookup(String, String...)
      */
-    public abstract InternalResponse lookup( String dn ) throws LdapException;
+    public abstract Response lookup( String dn ) throws LdapException;
 
 
     /**
@@ -554,7 +554,7 @@ public interface LdapConnection
      * @return the Entry with the given DN or null if no entry exists with that DN
      * @throws LdapException in case of any problems while searching for the DN
      */
-    public abstract InternalResponse lookup( DN dn, String... attributes ) throws LdapException;
+    public abstract Response lookup( DN dn, String... attributes ) throws LdapException;
 
 
     /**
@@ -565,7 +565,7 @@ public interface LdapConnection
      * @return the Entry with the given DN or null if no entry exists with that DN
      * @throws LdapException in case of any problems while searching for the DN
      */
-    public abstract InternalResponse lookup( String dn, String... attributes ) throws LdapException;
+    public abstract Response lookup( String dn, String... attributes ) throws LdapException;
 
 
     /**

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Aug 14 14:18:49 2010
@@ -100,19 +100,19 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -182,7 +182,7 @@ public class LdapNetworkConnection exten
     private AtomicInteger messageId;
 
     /** a map to hold the ResponseFutures for all operations */
-    private Map<Integer, ResponseFuture<? extends InternalResponse>> futureMap = new ConcurrentHashMap<Integer, ResponseFuture<? extends InternalResponse>>();
+    private Map<Integer, ResponseFuture<? extends Response>> futureMap = new ConcurrentHashMap<Integer, ResponseFuture<? extends Response>>();
 
     /** list of controls supported by the server */
     private List<String> supportedControls;
@@ -254,16 +254,16 @@ public class LdapNetworkConnection exten
     }
 
 
-    private void addToFutureMap( int messageId, ResponseFuture<? extends InternalResponse> future )
+    private void addToFutureMap( int messageId, ResponseFuture<? extends Response> future )
     {
         LOG.debug( "Adding <" + messageId + ", " + future.getClass().getName() + ">" );
         futureMap.put( messageId, future );
     }
 
 
-    private ResponseFuture<? extends InternalResponse> getFromFutureMap( int messageId )
+    private ResponseFuture<? extends Response> getFromFutureMap( int messageId )
     {
-        ResponseFuture<? extends InternalResponse> future = futureMap.remove( messageId );
+        ResponseFuture<? extends Response> future = futureMap.remove( messageId );
 
         if ( future != null )
         {
@@ -274,9 +274,9 @@ public class LdapNetworkConnection exten
     }
 
 
-    private ResponseFuture<? extends InternalResponse> peekFromFutureMap( int messageId )
+    private ResponseFuture<? extends Response> peekFromFutureMap( int messageId )
     {
-        ResponseFuture<? extends InternalResponse> future = futureMap.get( messageId );
+        ResponseFuture<? extends Response> future = futureMap.get( messageId );
 
         // future can be null if there was a abandon operation on that messageId
         if ( future != null )
@@ -572,7 +572,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalAddResponse add( Entry entry ) throws LdapException
+    public AddResponse add( Entry entry ) throws LdapException
     {
         if ( entry == null )
         {
@@ -604,7 +604,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalAddResponse add( AddRequest addRequest ) throws LdapException
+    public AddResponse add( AddRequest addRequest ) throws LdapException
     {
         AddFuture addFuture = addAsync( addRequest );
 
@@ -615,7 +615,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( addRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalAddResponse addResponse = addFuture.get( timeout, TimeUnit.MILLISECONDS );
+            AddResponse addResponse = addFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( addResponse == null )
             {
@@ -756,7 +756,7 @@ public class LdapNetworkConnection exten
         // remove the associated listener if any
         int abandonId = abandonRequest.getAbandonedMessageId();
 
-        ResponseFuture<? extends InternalResponse> rf = getFromFutureMap( abandonId );
+        ResponseFuture<? extends Response> rf = getFromFutureMap( abandonId );
 
         // if the listener is not null, this is a async operation and no need to
         // send cancel signal on future, sending so will leave a dangling poision object in the corresponding queue
@@ -780,7 +780,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind() throws LdapException, IOException
+    public BindResponse bind() throws LdapException, IOException
     {
         LOG.debug( "Anonymous Bind request" );
 
@@ -812,7 +812,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( String name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( String name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -844,7 +844,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( DN name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( DN name, String credentials ) throws LdapException, IOException
     {
         LOG.debug( "Bind request : {}", name );
 
@@ -892,7 +892,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
+    public BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
     {
         BindFuture bindFuture = bindAsync( bindRequest );
 
@@ -903,7 +903,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( bindRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalBindResponse bindResponse = bindFuture.get( timeout, TimeUnit.MILLISECONDS );
+            BindResponse bindResponse = bindFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( bindResponse == null )
             {
@@ -1150,7 +1150,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> search( DN baseDn, String filter, SearchScope scope, String... attributes )
+    public Cursor<Response> search( DN baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         if ( baseDn == null )
@@ -1176,7 +1176,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> search( String baseDn, String filter, SearchScope scope, String... attributes )
+    public Cursor<Response> search( String baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         return search( new DN( baseDn ), filter, scope, attributes );
@@ -1258,7 +1258,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> search( SearchRequest searchRequest ) throws LdapException
+    public Cursor<Response> search( SearchRequest searchRequest ) throws LdapException
     {
         SearchFuture searchFuture = searchAsync( searchRequest );
 
@@ -1375,7 +1375,7 @@ public class LdapNetworkConnection exten
 
         // this check is necessary to prevent adding an abandoned operation's
         // result(s) to corresponding queue
-        ResponseFuture<? extends InternalResponse> responseFuture = peekFromFutureMap( messageId );
+        ResponseFuture<? extends Response> responseFuture = peekFromFutureMap( messageId );
 
         if ( responseFuture == null )
         {
@@ -1387,7 +1387,7 @@ public class LdapNetworkConnection exten
         {
             case ADD_RESPONSE:
                 // Transform the response
-                InternalAddResponse addResponse = ( InternalAddResponse ) response;
+                AddResponse addResponse = ( AddResponse ) response;
 
                 AddFuture addFuture = ( AddFuture ) responseFuture;
 
@@ -1422,7 +1422,7 @@ public class LdapNetworkConnection exten
 
             case BIND_RESPONSE:
                 // Transform the response
-                InternalBindResponse bindResponse = ( InternalBindResponse ) response;
+                BindResponse bindResponse = ( BindResponse ) response;
 
                 BindFuture bindFuture = ( BindFuture ) responseFuture;
 
@@ -1456,7 +1456,7 @@ public class LdapNetworkConnection exten
 
             case COMPARE_RESPONSE:
                 // Transform the response
-                InternalCompareResponse compareResponse = ( InternalCompareResponse ) response;
+                CompareResponse compareResponse = ( CompareResponse ) response;
 
                 CompareFuture compareFuture = ( CompareFuture ) responseFuture;
 
@@ -1491,7 +1491,7 @@ public class LdapNetworkConnection exten
 
             case DEL_RESPONSE:
                 // Transform the response
-                InternalDeleteResponse deleteResponse = ( InternalDeleteResponse ) response;
+                DeleteResponse deleteResponse = ( DeleteResponse ) response;
 
                 DeleteFuture deleteFuture = ( DeleteFuture ) responseFuture;
 
@@ -1525,7 +1525,7 @@ public class LdapNetworkConnection exten
 
             case EXTENDED_RESPONSE:
                 // Transform the response
-                InternalExtendedResponse extendedResponse = ( InternalExtendedResponse ) response;
+                ExtendedResponse extendedResponse = ( ExtendedResponse ) response;
 
                 ExtendedFuture extendedFuture = ( ExtendedFuture ) responseFuture;
 
@@ -1588,7 +1588,7 @@ public class LdapNetworkConnection exten
 
             case MODIFY_RESPONSE:
                 // Transform the response
-                InternalModifyResponse modifyResponse = ( InternalModifyResponse ) response;
+                ModifyResponse modifyResponse = ( ModifyResponse ) response;
 
                 ModifyFuture modifyFuture = ( ModifyFuture ) responseFuture;
 
@@ -1622,7 +1622,7 @@ public class LdapNetworkConnection exten
 
             case MODIFYDN_RESPONSE:
                 // Transform the response
-                InternalModifyDnResponse modifyDnResponse = ( InternalModifyDnResponse ) response;
+                ModifyDnResponse modifyDnResponse = ( ModifyDnResponse ) response;
 
                 ModifyDnFuture modifyDnFuture = ( ModifyDnFuture ) responseFuture;
 
@@ -1656,7 +1656,7 @@ public class LdapNetworkConnection exten
 
             case SEARCH_RESULT_DONE:
                 // Store the response into the responseQueue
-                InternalSearchResultDone searchResultDone = ( InternalSearchResultDone ) response;
+                SearchResultDone searchResultDone = ( SearchResultDone ) response;
 
                 SearchFuture searchFuture = ( SearchFuture ) responseFuture;
 
@@ -1690,7 +1690,7 @@ public class LdapNetworkConnection exten
 
             case SEARCH_RESULT_ENTRY:
                 // Store the response into the responseQueue
-                InternalSearchResultEntry searchResultEntry = ( InternalSearchResultEntry ) response;
+                SearchResultEntry searchResultEntry = ( SearchResultEntry ) response;
 
                 if ( schemaManager != null )
                 {
@@ -1717,7 +1717,7 @@ public class LdapNetworkConnection exten
 
             case SEARCH_RESULT_REFERENCE:
                 // Store the response into the responseQueue
-                InternalSearchResultReference searchResultReference = ( InternalSearchResultReference ) response;
+                SearchResultReference searchResultReference = ( SearchResultReference ) response;
 
                 searchFuture = ( SearchFuture ) responseFuture;
 
@@ -1744,7 +1744,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException
+    public ModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException
     {
         if ( entry == null )
         {
@@ -1767,7 +1767,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
+    public ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
     {
         if ( dn == null )
         {
@@ -1785,7 +1785,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( String dn, Modification... modifications ) throws LdapException
+    public ModifyResponse modify( String dn, Modification... modifications ) throws LdapException
     {
         return modify( new DN( dn ), modifications );
     }
@@ -1794,7 +1794,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( ModifyRequest modRequest ) throws LdapException
+    public ModifyResponse modify( ModifyRequest modRequest ) throws LdapException
     {
         ModifyFuture modifyFuture = modifyAsync( modRequest );
 
@@ -1805,7 +1805,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( modRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalModifyResponse modifyResponse = modifyFuture.get( timeout, TimeUnit.MILLISECONDS );
+            ModifyResponse modifyResponse = modifyFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( modifyResponse == null )
             {
@@ -1898,7 +1898,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException
+    public ModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException
     {
         return rename( entryDn, newRdn, true );
     }
@@ -1907,7 +1907,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
+    public ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
     {
         return rename( entryDn, newRdn, true );
     }
@@ -1916,7 +1916,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
     {
         try
         {
@@ -1933,7 +1933,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( DN 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 );
@@ -1947,7 +1947,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException
     {
         try
         {
@@ -1964,7 +1964,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
     {
         ModifyDnRequest modDnRequest = new ModifyDnRequest();
         modDnRequest.setEntryDn( entryDn );
@@ -1982,7 +1982,7 @@ public class LdapNetworkConnection exten
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
+    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
     {
         return moveAndRename( entryDn, newDn, true );
     }
@@ -1993,7 +1993,7 @@ public class LdapNetworkConnection exten
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public InternalModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
+    public ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
     {
         return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
     }
@@ -2006,7 +2006,7 @@ public class LdapNetworkConnection exten
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
     {
         // Check the parameters first
         if ( entryDn == null )
@@ -2047,7 +2047,7 @@ public class LdapNetworkConnection exten
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public InternalModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
+    public ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
         throws LdapException
     {
         return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
@@ -2057,7 +2057,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
+    public ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
     {
         ModifyDnFuture modifyDnFuture = modifyDnAsync( modDnRequest );
 
@@ -2068,7 +2068,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( modDnRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalModifyDnResponse modifyDnResponse = modifyDnFuture.get( timeout, TimeUnit.MILLISECONDS );
+            ModifyDnResponse modifyDnResponse = modifyDnFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( modifyDnResponse == null )
             {
@@ -2163,7 +2163,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( String dn ) throws LdapException
+    public DeleteResponse delete( String dn ) throws LdapException
     {
         return delete( new DN( dn ) );
     }
@@ -2172,7 +2172,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( DN dn ) throws LdapException
+    public DeleteResponse delete( DN dn ) throws LdapException
     {
         DeleteRequest deleteRequest = new DeleteRequest( dn );
 
@@ -2187,7 +2187,7 @@ public class LdapNetworkConnection exten
      * @return operation's response
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public InternalDeleteResponse deleteTree( DN dn ) throws LdapException
+    public DeleteResponse deleteTree( DN dn ) throws LdapException
     {
         String treeDeleteOid = "1.2.840.113556.1.4.805";
 
@@ -2214,7 +2214,7 @@ public class LdapNetworkConnection exten
      * @return operation's response
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public InternalDeleteResponse deleteTree( String dn ) throws LdapException
+    public DeleteResponse deleteTree( String dn ) throws LdapException
     {
         try
         {
@@ -2274,18 +2274,18 @@ public class LdapNetworkConnection exten
      * @param listener  the delete operation response listener
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    private InternalDeleteResponse deleteRecursive( DN dn, Map<DN, Cursor<InternalResponse>> cursorMap,
+    private DeleteResponse deleteRecursive( DN dn, Map<DN, Cursor<Response>> cursorMap,
         DeleteListener listener ) throws LdapException
     {
         LOG.debug( "searching for {}", dn.getName() );
-        InternalDeleteResponse delResponse = null;
-        Cursor<InternalResponse> cursor = null;
+        DeleteResponse delResponse = null;
+        Cursor<Response> cursor = null;
 
         try
         {
             if ( cursorMap == null )
             {
-                cursorMap = new HashMap<DN, Cursor<InternalResponse>>();
+                cursorMap = new HashMap<DN, Cursor<Response>>();
             }
 
             cursor = cursorMap.get( dn );
@@ -2308,11 +2308,11 @@ public class LdapNetworkConnection exten
             {
                 do
                 {
-                    InternalResponse searchResp = cursor.get();
+                    Response searchResp = cursor.get();
 
-                    if ( searchResp instanceof InternalSearchResultEntry )
+                    if ( searchResp instanceof SearchResultEntry )
                     {
-                        InternalSearchResultEntry searchResult = ( InternalSearchResultEntry ) searchResp;
+                        SearchResultEntry searchResult = ( SearchResultEntry ) searchResp;
                         deleteRecursive( searchResult.getEntry().getDn(), cursorMap, listener );
                     }
                 }
@@ -2338,7 +2338,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
+    public DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
     {
         DeleteFuture deleteFuture = deleteAsync( deleteRequest );
 
@@ -2349,7 +2349,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( deleteRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalDeleteResponse delResponse = deleteFuture.get( timeout, TimeUnit.MILLISECONDS );
+            DeleteResponse delResponse = deleteFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( delResponse == null )
             {
@@ -2441,7 +2441,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, String value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, String value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -2450,7 +2450,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -2459,7 +2459,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -2468,7 +2468,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN 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 );
@@ -2482,7 +2482,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN 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 );
@@ -2496,7 +2496,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN 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 );
@@ -2510,7 +2510,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( CompareRequest compareRequest ) throws LdapException
+    public CompareResponse compare( CompareRequest compareRequest ) throws LdapException
     {
         CompareFuture compareFuture = compareAsync( compareRequest );
 
@@ -2521,7 +2521,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( compareRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalCompareResponse compareResponse = compareFuture.get( timeout, TimeUnit.MILLISECONDS );
+            CompareResponse compareResponse = compareFuture.get( timeout, TimeUnit.MILLISECONDS );
 
             if ( compareResponse == null )
             {
@@ -2615,7 +2615,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( String oid ) throws LdapException
+    public ExtendedResponse extended( String oid ) throws LdapException
     {
         return extended( oid, null );
     }
@@ -2624,7 +2624,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( String oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( String oid, byte[] value ) throws LdapException
     {
         try
         {
@@ -2642,7 +2642,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( OID oid ) throws LdapException
+    public ExtendedResponse extended( OID oid ) throws LdapException
     {
         return extended( oid, null );
     }
@@ -2651,7 +2651,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( OID oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( OID oid, byte[] value ) throws LdapException
     {
         ExtendedRequest extRequest = new ExtendedRequest( oid );
         extRequest.setValue( value );
@@ -2663,7 +2663,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
+    public ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
     {
         ExtendedFuture extendedFuture = extendedAsync( extendedRequest );
 
@@ -2674,7 +2674,7 @@ public class LdapNetworkConnection exten
             long timeout = getTimeout( extendedRequest.getTimeout() );
 
             // Get the response, blocking
-            InternalExtendedResponse extendedResponse = ( InternalExtendedResponse ) extendedFuture.get( timeout,
+            ExtendedResponse extendedResponse = ( ExtendedResponse ) extendedFuture.get( timeout,
                 TimeUnit.MILLISECONDS );
 
             if ( extendedResponse == null )
@@ -2768,7 +2768,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( DN dn ) throws LdapException
+    public Response lookup( DN dn ) throws LdapException
     {
         return lookup( dn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
     }
@@ -2777,7 +2777,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( String dn ) throws LdapException
+    public Response lookup( String dn ) throws LdapException
     {
         return lookup( dn, SchemaConstants.ALL_USER_ATTRIBUTES_ARRAY );
     }
@@ -2786,13 +2786,13 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( DN dn, String... attributes ) throws LdapException
+    public Response lookup( DN dn, String... attributes ) throws LdapException
     {
-        InternalResponse resp = null;
+        Response resp = null;
 
         try
         {
-            Cursor<InternalResponse> cursor = search( dn, "(objectClass=*)", SearchScope.OBJECT, attributes );
+            Cursor<Response> cursor = search( dn, "(objectClass=*)", SearchScope.OBJECT, attributes );
 
             // Read the response
             if ( cursor.next() )
@@ -2819,7 +2819,7 @@ public class LdapNetworkConnection exten
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( String dn, String... attributes ) throws LdapException
+    public Response lookup( String dn, String... attributes ) throws LdapException
     {
         return lookup( new DN( dn ), attributes );
     }
@@ -2969,12 +2969,12 @@ public class LdapNetworkConnection exten
      */
     private void fetchRootDSE() throws LdapException
     {
-        Cursor<InternalResponse> cursor = null;
+        Cursor<Response> cursor = null;
         try
         {
             cursor = search( "", "(objectClass=*)", SearchScope.OBJECT, "*", "+" );
             cursor.next();
-            InternalSearchResultEntry searchRes = ( InternalSearchResultEntry ) cursor.get();
+            SearchResultEntry searchRes = ( SearchResultEntry ) cursor.get();
 
             rootDSE = searchRes.getEntry();
         }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java Sat Aug 14 14:18:49 2010
@@ -27,8 +27,8 @@ import org.apache.directory.ldap.client.
 import org.apache.directory.shared.ldap.cursor.AbstractCursor;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
 
 
 /**
@@ -51,12 +51,12 @@ public class SearchCursor extends Abstra
     private TimeUnit timeUnit;
 
     /** a reference to hold the retrieved SearchResponse object from SearchFuture */
-    private InternalResponse response;
+    private Response response;
 
     private boolean done;
 
     /** a reference to hold the SearchResultDone response */
-    private InternalSearchResultDone searchDoneResp;
+    private SearchResultDone searchDoneResp;
 
 
     public SearchCursor( SearchFuture future, long timeout, TimeUnit timeUnit )
@@ -109,11 +109,11 @@ public class SearchCursor extends Abstra
             throw new LdapException( LdapNetworkConnection.TIME_OUT_ERROR );
         }
 
-        done = ( response instanceof InternalSearchResultDone );
+        done = ( response instanceof SearchResultDone );
 
         if ( done )
         {
-            searchDoneResp = ( InternalSearchResultDone ) response;
+            searchDoneResp = ( SearchResultDone ) response;
             response = null;
         }
 
@@ -121,7 +121,7 @@ public class SearchCursor extends Abstra
     }
 
 
-    public InternalResponse get() throws Exception
+    public Response get() throws Exception
     {
         if ( !available() )
         {
@@ -137,7 +137,7 @@ public class SearchCursor extends Abstra
      * 
      * @return the SearchResultDone message, null if the search operation fails for any reason 
      */
-    public InternalSearchResultDone getSearchDone()
+    public SearchResultDone getSearchDone()
     {
         return searchDoneResp;
     }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AddFuture extends ResponseFuture<InternalAddResponse>
+public class AddFuture extends ResponseFuture<AddResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class AddFuture extends ResponseF
      * 
      * @return The AddResponse
      */
-    public InternalAddResponse get() throws InterruptedException, ExecutionException
+    public AddResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class AddFuture extends ResponseF
      * @param unit The TimeUnit
      * @return The AddResponse The AddResponse found
      */
-    public InternalAddResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public AddResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BindFuture extends ResponseFuture<InternalBindResponse>
+public class BindFuture extends ResponseFuture<BindResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class BindFuture extends Response
      * 
      * @return The BindResponse
      */
-    public InternalBindResponse get() throws InterruptedException, ExecutionException
+    public BindResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class BindFuture extends Response
      * @param unit The TimeUnit
      * @return The BindResponse The BindResponse found
      */
-    public InternalBindResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public BindResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CompareFuture extends ResponseFuture<InternalCompareResponse>
+public class CompareFuture extends ResponseFuture<CompareResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class CompareFuture extends Respo
      * 
      * @return The CompareResponse
      */
-    public InternalCompareResponse get() throws InterruptedException, ExecutionException
+    public CompareResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class CompareFuture extends Respo
      * @param unit The TimeUnit
      * @return The CompareResponse The CompareResponse found
      */
-    public InternalCompareResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public CompareResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DeleteFuture extends ResponseFuture<InternalDeleteResponse>
+public class DeleteFuture extends ResponseFuture<DeleteResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class DeleteFuture extends Respon
      * 
      * @return The DeleteResponse
      */
-    public InternalDeleteResponse get() throws InterruptedException, ExecutionException
+    public DeleteResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class DeleteFuture extends Respon
      * @param unit The TimeUnit
      * @return The DeleteResponse The DeleteResponse found
      */
-    public InternalDeleteResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public DeleteResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ExtendedFuture extends ResponseFuture<InternalResponse>
+public class ExtendedFuture extends ResponseFuture<Response>
 {
     /**
      *
@@ -51,7 +51,7 @@ public class ExtendedFuture extends Resp
      *
      * @return The ExtendedResponse
      */
-    public InternalResponse get() throws InterruptedException, ExecutionException
+    public Response get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -65,7 +65,7 @@ public class ExtendedFuture extends Resp
      * @param unit The TimeUnit
      * @return The ExtendedResponse The ExtendedResponse found
      */
-    public InternalResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public Response get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ModifyDnFuture extends ResponseFuture<InternalModifyDnResponse>
+public class ModifyDnFuture extends ResponseFuture<ModifyDnResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class ModifyDnFuture extends Resp
      * 
      * @return The ModifyDnResponse
      */
-    public InternalModifyDnResponse get() throws InterruptedException, ExecutionException
+    public ModifyDnResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class ModifyDnFuture extends Resp
      * @param unit The TimeUnit
      * @return The ModifyDnResponse The ModifyDnResponse found
      */
-    public InternalModifyDnResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public ModifyDnResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ModifyFuture extends ResponseFuture<InternalModifyResponse>
+public class ModifyFuture extends ResponseFuture<ModifyResponse>
 {
     /**
      * 
@@ -53,7 +53,7 @@ public class ModifyFuture extends Respon
      * 
      * @return The ModifyResponse
      */
-    public InternalModifyResponse get() throws InterruptedException, ExecutionException
+    public ModifyResponse get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -67,7 +67,7 @@ public class ModifyFuture extends Respon
      * @param unit The TimeUnit
      * @return The ModifyResponse The ModifyResponse found
      */
-    public InternalModifyResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public ModifyResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java Sat Aug 14 14:18:49 2010
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SearchFuture extends ResponseFuture<InternalResponse>
+public class SearchFuture extends ResponseFuture<Response>
 {
     /**
      * 
@@ -55,7 +55,7 @@ public class SearchFuture extends Respon
      * 
      * @return The SearchResponse
      */
-    public InternalResponse get() throws InterruptedException, ExecutionException
+    public Response get() throws InterruptedException, ExecutionException
     {
         return super.get();
     }
@@ -69,7 +69,7 @@ public class SearchFuture extends Respon
      * @param unit The TimeUnit
      * @return The SearchResponse The SearchResponse found
      */
-    public InternalResponse get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
+    public Response get( long timeout, TimeUnit unit ) throws InterruptedException, ExecutionException,
         TimeoutException
     {
         return super.get( timeout, unit );

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
 
 
 /**
@@ -40,5 +40,5 @@ public interface AddListener extends Ope
      * @param response the add operation's response
      * @throws LdapException
      */
-    public void entryAdded( LdapAsyncConnection connection, InternalAddResponse response ) throws LdapException;
+    public void entryAdded( LdapAsyncConnection connection, AddResponse response ) throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java Sat Aug 14 14:18:49 2010
@@ -22,7 +22,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 
 
 /**
@@ -41,5 +41,5 @@ public interface BindListener extends Op
      * @param connection
      * @param BindResponseCodec The bind response
      */
-    void bindCompleted( LdapAsyncConnection connection, InternalBindResponse bindResponse ) throws LdapException;
+    void bindCompleted( LdapAsyncConnection connection, BindResponse bindResponse ) throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 
 
 /**
@@ -40,6 +40,6 @@ public interface CompareListener extends
      * @param response the compare operation's response
      * @throws LdapException
      */
-    public void attributeCompared( LdapAsyncConnection connection, InternalCompareResponse response )
+    public void attributeCompared( LdapAsyncConnection connection, CompareResponse response )
         throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 
 
 /**
@@ -40,5 +40,5 @@ public interface DeleteListener extends 
      * @param response the delete operation's response
      * @throws LdapException
      */
-    public void entryDeleted( LdapAsyncConnection connection, InternalDeleteResponse response ) throws LdapException;
+    public void entryDeleted( LdapAsyncConnection connection, DeleteResponse response ) throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 
 
 /**
@@ -40,6 +40,6 @@ public interface ExtendedListener extend
      * @param response the extended operation's response
      * @throws LdapException
      */
-    public void extendedOperationCompleted( LdapAsyncConnection connection, InternalExtendedResponse response )
+    public void extendedOperationCompleted( LdapAsyncConnection connection, ExtendedResponse response )
         throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 
 
 /**
@@ -41,6 +41,6 @@ public interface ModifyDnListener extend
      * @param response the modifyDn operation's response
      * @throws LdapException
      */
-    public void modifyDnCompleted( LdapAsyncConnection connection, InternalModifyDnResponse response )
+    public void modifyDnCompleted( LdapAsyncConnection connection, ModifyDnResponse response )
         throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
 
 
 /**
@@ -41,5 +41,5 @@ public interface ModifyListener extends 
      * @param response the modify operation's response
      * @throws LdapException
      */
-    public void modifyCompleted( LdapAsyncConnection connection, InternalModifyResponse response ) throws LdapException;
+    public void modifyCompleted( LdapAsyncConnection connection, ModifyResponse response ) throws LdapException;
 }

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java Sat Aug 14 14:18:49 2010
@@ -22,9 +22,9 @@ package org.apache.directory.ldap.client
 
 import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultReference;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultReference;
 
 
 /**
@@ -43,7 +43,7 @@ public interface SearchListener extends 
      * @param connection The LdapConnection
      * @param searchResultEntry The found entry
      */
-    void entryFound( LdapAsyncConnection connection, InternalSearchResultEntry searchResultEntry ) throws LdapException;
+    void entryFound( LdapAsyncConnection connection, SearchResultEntry searchResultEntry ) throws LdapException;
 
 
     /**
@@ -52,7 +52,7 @@ public interface SearchListener extends 
      * @param connection The LdapConnection
      * @param searchResultReference The referral message
      */
-    void referralFound( LdapAsyncConnection connection, InternalSearchResultReference searchResultReference )
+    void referralFound( LdapAsyncConnection connection, SearchResultReference searchResultReference )
         throws LdapException;
 
 
@@ -62,5 +62,5 @@ public interface SearchListener extends 
      * @param connection The LdapConnection
      * @param searchResultDone The searchResultDone response
      */
-    void searchDone( LdapAsyncConnection connection, InternalSearchResultDone searchResultDone ) throws LdapException;
+    void searchDone( LdapAsyncConnection connection, SearchResultDone searchResultDone ) throws LdapException;
 }



Mime
View raw message