directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985495 [4/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/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Sat Aug 14 14:18:49 2010
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -105,7 +105,7 @@ public class PersistentSearchListener im
     }
     
     
-    private void setECResponseControl( InternalSearchResultEntry response, ChangeOperationContext opContext, ChangeType type )
+    private void setECResponseControl( SearchResultEntry response, ChangeOperationContext opContext, ChangeType type )
     {
         if ( control.isReturnECs() )
         {
@@ -134,7 +134,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+        SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( addContext.getDn() );
         respEntry.setEntry( addContext.getEntry() );
         setECResponseControl( respEntry, addContext, ChangeType.ADD );
@@ -149,7 +149,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+        SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( deleteContext.getDn() );
         respEntry.setEntry( deleteContext.getEntry() );
         setECResponseControl( respEntry, deleteContext, ChangeType.DELETE );
@@ -164,7 +164,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+        SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( modifyContext.getDn() );
         respEntry.setEntry( modifyContext.getAlteredEntry() );
         setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
@@ -179,7 +179,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+        SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( moveContext.getDn() );
         respEntry.setEntry( moveContext.getEntry() );
         setECResponseControl( respEntry, moveContext, ChangeType.MODDN );
@@ -200,7 +200,7 @@ public class PersistentSearchListener im
             return;
         }
     
-        InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+        SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
         respEntry.setObjectName( renameContext.getModifiedEntry().getDn() );
         respEntry.setEntry( renameContext.getModifiedEntry() );
         setECResponseControl( respEntry, renameContext, ChangeType.MODDN );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sat Aug 14 14:18:49 2010
@@ -61,14 +61,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-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;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.LdapURL;
@@ -136,7 +136,7 @@ public class SearchHandler extends LdapR
          */
         if ( ! psearchControl.isChangesOnly() )
         {
-            InternalSearchResultDone done = doSimpleSearch( session, req );
+            SearchResultDone done = doSimpleSearch( session, req );
 
             // ok if normal search beforehand failed somehow quickly abandon psearch
             if ( done.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
@@ -357,7 +357,7 @@ public class SearchHandler extends LdapR
     }
 
 
-    private void readResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
+    private void readResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
     EntryFilteringCursor cursor, long sizeLimit ) throws Exception
     {
         long count = 0;
@@ -402,7 +402,7 @@ public class SearchHandler extends LdapR
     }
 
 
-    private void readPagedResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
+    private void readPagedResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
         EntryFilteringCursor cursor, long sizeLimit, int pagedLimit,
         PagedSearchContext pagedContext, PagedResultsControl pagedResultsControl ) throws Exception
     {
@@ -500,7 +500,7 @@ public class SearchHandler extends LdapR
      * Manage the abandoned Paged Search (when paged size = 0). We have to
      * remove the cookie and its associated cursor from the session.
      */
-    private InternalSearchResultDone abandonPagedSearch( LdapSession session, InternalSearchRequest req )
+    private SearchResultDone abandonPagedSearch( LdapSession session, InternalSearchRequest req )
         throws Exception
     {
         PagedResultsControl pagedResultsControl = null;
@@ -536,10 +536,10 @@ public class SearchHandler extends LdapR
 
         // and return
         // DO NOT WRITE THE RESPONSE - JUST RETURN IT
-        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
+        LdapResult ldapResult = req.getResultResponse().getLdapResult();
         ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
         req.getResultResponse().add( pagedResultsControl );
-        return ( InternalSearchResultDone ) req.getResultResponse();
+        return ( SearchResultDone ) req.getResultResponse();
     }
 
 
@@ -562,7 +562,7 @@ public class SearchHandler extends LdapR
     /**
      * Handle a Paged Search request.
      */
-    private InternalSearchResultDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedResultsControl control )
+    private SearchResultDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedResultsControl control )
         throws Exception
     {
         PagedResultsControl pagedSearchControl = control;
@@ -603,7 +603,7 @@ public class SearchHandler extends LdapR
 
         // Now, depending on the cookie, we will deal with case 2, 3, 4 and 5
         byte [] cookie= pagedSearchControl.getCookie();
-        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
+        LdapResult ldapResult = req.getResultResponse().getLdapResult();
 
         if ( StringTools.isEmpty( cookie ) )
         {
@@ -638,7 +638,7 @@ public class SearchHandler extends LdapR
 
                 // If we had a cookie in the session, remove it
                 removeContext( session, pagedContext );
-                return ( InternalSearchResultDone ) req.getResultResponse();
+                return ( SearchResultDone ) req.getResultResponse();
             }
             else
             {
@@ -677,7 +677,7 @@ public class SearchHandler extends LdapR
                 ldapResult.setErrorMessage( "Invalid cookie for this PagedSearch request." );
                 ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
 
-                return ( InternalSearchResultDone ) req.getResultResponse();
+                return ( SearchResultDone ) req.getResultResponse();
             }
 
             if ( pagedContext.hasSameRequest( req, session ) )
@@ -742,7 +742,7 @@ public class SearchHandler extends LdapR
             }
         }
 
-        return ( InternalSearchResultDone ) req.getResultResponse();
+        return ( SearchResultDone ) req.getResultResponse();
     }
 
 
@@ -757,10 +757,10 @@ public class SearchHandler extends LdapR
      * @return the result done
      * @throws Exception if there are failures while processing the request
      */
-    private InternalSearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req )
+    private SearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req )
         throws Exception
     {
-        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
+        LdapResult ldapResult = req.getResultResponse().getLdapResult();
 
         // Check if we are using the Paged Search Control
         Object control = req.getControls().get( PagedResultsControl.CONTROL_OID );
@@ -814,7 +814,7 @@ public class SearchHandler extends LdapR
             }
         }
 
-        return ( InternalSearchResultDone ) req.getResultResponse();
+        return ( SearchResultDone ) req.getResultResponse();
     }
 
 
@@ -830,7 +830,7 @@ public class SearchHandler extends LdapR
      * @return the response for the entry
      * @throws Exception if there are problems in generating the response
      */
-    private InternalResponse generateResponse( LdapSession session, InternalSearchRequest req, Entry entry ) throws Exception
+    private Response generateResponse( LdapSession session, InternalSearchRequest req, Entry entry ) throws Exception
     {
         EntryAttribute ref = ((ClonedServerEntry)entry).getOriginalEntry().get( SchemaConstants.REF_AT );
         boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
@@ -838,7 +838,7 @@ public class SearchHandler extends LdapR
         if ( ( ref != null ) && ! hasManageDsaItControl )
         {
             // The entry is a referral.
-            InternalSearchResultReference respRef;
+            SearchResultReference respRef;
             respRef = new SearchResultReferenceImpl( req.getMessageId() );
             respRef.setReferral( new ReferralImpl() );
 
@@ -884,7 +884,7 @@ public class SearchHandler extends LdapR
         else
         {
             // The entry is not a referral, or the ManageDsaIt control is set
-            InternalSearchResultEntry respEntry;
+            SearchResultEntry respEntry;
             respEntry = new SearchResultEntryImpl( req.getMessageId() );
             respEntry.setEntry( entry );
             respEntry.setObjectName( entry.getDn() );
@@ -1040,7 +1040,7 @@ public class SearchHandler extends LdapR
             // ===============================================================
 
             //long t0 = System.nanoTime();
-            InternalSearchResultDone done = doSimpleSearch( session, req );
+            SearchResultDone done = doSimpleSearch( session, req );
             //long t1 = System.nanoTime();
             session.getIoSession().write( done );
             //.print( "Handler;" + ((t1-t0)/1000) + ";" );
@@ -1091,7 +1091,7 @@ public class SearchHandler extends LdapR
      */
     private void handleWithReferrals( LdapSession session, InternalSearchRequest req ) throws LdapException
     {
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
         Entry entry = null;
         boolean isReferral = false;
         boolean isparentReferral = false;
@@ -1231,7 +1231,7 @@ public class SearchHandler extends LdapR
     private void handleReferralEntryForSearch( LdapSession session, InternalSearchRequest req, ClonedServerEntry entry )
         throws Exception
     {
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
         ReferralImpl referral = new ReferralImpl();
         result.setReferral( referral );
         result.setResultCode( ResultCodeEnum.REFERRAL );
@@ -1533,7 +1533,7 @@ public class SearchHandler extends LdapR
      */
     public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
     {
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
 
         /*
          * Set the result code or guess the best option.

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Sat Aug 14 14:18:49 2010
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 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.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.session.IoSession;
@@ -232,7 +232,7 @@ public abstract class AbstractSaslCallba
      */
     protected LdapContext getContext( IoSession session, InternalBindRequest bindRequest, Hashtable<String, Object> env )
     {
-        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+        LdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         LdapContext ctx = null;
 

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Sat Aug 14 14:18:49 2010
@@ -32,8 +32,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapOperationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@ public class SimpleMechanismHandler impl
             ldapSession.setCoreSession( bindContext.getSession() );
             
             // Return the successful response
-            InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
+            BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
             response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
             LdapProtocolUtils.setResponseControls( bindContext, response );
             
@@ -87,7 +87,7 @@ public class SimpleMechanismHandler impl
         {
             // Something went wrong. Write back an error message            
             ResultCodeEnum code = null;
-            InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+            LdapResult result = bindRequest.getResultResponse().getLdapResult();
 
             if ( e instanceof LdapOperationException )
             {

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java Sat Aug 14 14:18:49 2010
@@ -43,8 +43,8 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.filter.ssl.SslFilter;
 import org.slf4j.Logger;
@@ -90,8 +90,8 @@ public class StartTlsHandler implements 
             sslFilter.startSsl( session.getIoSession() );
         }
 
-        InternalExtendedResponse res = new ExtendedResponseImpl( req.getMessageId() );
-        InternalLdapResult result = res.getLdapResult();
+        ExtendedResponse res = new ExtendedResponseImpl( req.getMessageId() );
+        LdapResult result = res.getLdapResult();
         result.setResultCode( ResultCodeEnum.SUCCESS );
         res.setResponseName( EXTENSION_OID );
         res.setResponseValue( new byte[0] );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Sat Aug 14 14:18:49 2010
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.sp.LdapContextParameter;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -104,7 +104,7 @@ public class StoredProcedureExtendedOper
         Object response = engine.invokeProcedure( session.getCoreSession(), procedure, values );
 
         byte[] serializedResponse = SerializationUtils.serialize( ( Serializable ) response );
-        ( ( InternalExtendedResponse ) ( req.getResultResponse() ) ).setResponseValue( serializedResponse );
+        ( ( ExtendedResponse ) ( req.getResultResponse() ) ).setResponseValue( serializedResponse );
         session.getIoSession().write( req.getResultResponse() );
 
     }

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java Sat Aug 14 14:18:49 2010
@@ -42,8 +42,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
@@ -155,12 +155,12 @@ public class ReplicaDitStoreUtil
     {
         List<ReplicaEventLog> replicas = new ArrayList<ReplicaEventLog>();
 
-        Cursor<InternalResponse> cursor = coreConnection.search( REPL_CONSUMER_DN, "(objectClass=ads-replConsumer)",
+        Cursor<Response> cursor = coreConnection.search( REPL_CONSUMER_DN, "(objectClass=ads-replConsumer)",
             SearchScope.ONELEVEL, "+", "*" );
 
         while ( cursor.next() )
         {
-            Entry entry = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry entry = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             ReplicaEventLog replica = convertEntryToReplica( entry );
             replicas.add( replica );
         }

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Sat Aug 14 14:18:49 2010
@@ -72,13 +72,13 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-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.LdapResult;
+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;
@@ -220,7 +220,7 @@ public class SyncReplConsumer implements
             }
 
             // Do a bind
-            InternalBindResponse bindResponse = connection.bind( config.getReplUserDn(), config.getReplUserPassword() );
+            BindResponse bindResponse = connection.bind( config.getReplUserDn(), config.getReplUserPassword() );
 
             // Check that it' not null and valid
             if ( bindResponse == null )
@@ -230,7 +230,7 @@ public class SyncReplConsumer implements
             }
 
             // Now get the result
-            InternalLdapResult ldapResult = bindResponse.getLdapResult();
+            LdapResult ldapResult = bindResponse.getLdapResult();
 
             if ( ldapResult.getResultCode() != ResultCodeEnum.SUCCESS )
             {
@@ -279,7 +279,7 @@ public class SyncReplConsumer implements
     }
 
 
-    public ResultCodeEnum handleSearchDone( InternalSearchResultDone searchDone )
+    public ResultCodeEnum handleSearchDone( SearchResultDone searchDone )
     {
         LOG.debug( "///////////////// handleSearchDone //////////////////" );
 
@@ -310,14 +310,14 @@ public class SyncReplConsumer implements
     }
 
 
-    public void handleSearchReference( InternalSearchResultReference searchRef )
+    public void handleSearchReference( SearchResultReference searchRef )
     {
         // this method won't be called cause the provider will serve the referrals as
         // normal entry objects due to the usage of ManageDsaITControl in the search request
     }
 
 
-    public void handleSearchResult( InternalSearchResultEntry syncResult )
+    public void handleSearchResult( SearchResultEntry syncResult )
     {
 
         LOG.debug( "------------- starting handleSearchResult ------------" );
@@ -549,17 +549,17 @@ public class SyncReplConsumer implements
         // Do the search
         SearchFuture sf = connection.searchAsync( searchRequest );
 
-        InternalResponse resp = sf.get();
+        Response resp = sf.get();
 
-        while ( !( resp instanceof InternalSearchResultDone ) && !sf.isCancelled() )
+        while ( !( resp instanceof SearchResultDone ) && !sf.isCancelled() )
         {
-            if ( resp instanceof InternalSearchResultEntry )
+            if ( resp instanceof SearchResultEntry )
             {
-                handleSearchResult( ( InternalSearchResultEntry ) resp );
+                handleSearchResult( ( SearchResultEntry ) resp );
             }
-            else if ( resp instanceof InternalSearchResultReference )
+            else if ( resp instanceof SearchResultReference )
             {
-                handleSearchReference( ( InternalSearchResultReference ) resp );
+                handleSearchReference( ( SearchResultReference ) resp );
             }
             else if ( resp instanceof InternalIntermediateResponse )
             {
@@ -569,7 +569,7 @@ public class SyncReplConsumer implements
             resp = sf.get();
         }
 
-        ResultCodeEnum resultCode = handleSearchDone( ( InternalSearchResultDone ) resp );
+        ResultCodeEnum resultCode = handleSearchDone( ( SearchResultDone ) resp );
 
         LOG.debug( "sync operation returned result code {}", resultCode );
         if ( resultCode == ResultCodeEnum.NO_SUCH_OBJECT )

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Sat Aug 14 14:18:49 2010
@@ -78,12 +78,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
 import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalIntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-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;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -334,7 +334,7 @@ public class SyncReplProvider implements
         }
         else
         {
-            InternalSearchResultDone searchDoneResp = ( InternalSearchResultDone ) req.getResultResponse();
+            SearchResultDone searchDoneResp = ( SearchResultDone ) req.getResultResponse();
             searchDoneResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
             SyncDoneValueControl syncDone = new SyncDoneValueControl();
             syncDone.setCookie( cookie );
@@ -404,7 +404,7 @@ public class SyncReplProvider implements
         ExprNode initialContentFilter = new AndNode( modifiedFilter, csnNode );
         req.setFilter( initialContentFilter );
 
-        InternalSearchResultDone searchDoneResp = doSimpleSearch( session, req );
+        SearchResultDone searchDoneResp = doSimpleSearch( session, req );
         
         if ( searchDoneResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -457,11 +457,11 @@ public class SyncReplProvider implements
     }
 
 
-    private InternalSearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req )
+    private SearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req )
         throws Exception
     {
-        InternalSearchResultDone searchDoneResp = ( InternalSearchResultDone ) req.getResultResponse();
-        InternalLdapResult ldapResult = searchDoneResp.getLdapResult();
+        SearchResultDone searchDoneResp = ( SearchResultDone ) req.getResultResponse();
+        LdapResult ldapResult = searchDoneResp.getLdapResult();
 
         // A normal search
         // Check that we have a cursor or not. 
@@ -509,7 +509,7 @@ public class SyncReplProvider implements
     }
 
 
-    private void readResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
+    private void readResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
         EntryFilteringCursor cursor, long sizeLimit ) throws Exception
     {
         long count = 0;
@@ -569,7 +569,7 @@ public class SyncReplProvider implements
             entry.add( uuid );
         }
         
-        InternalResponse resp = generateResponse( session, req, entry );
+        Response resp = generateResponse( session, req, entry );
         resp.add( syncStateControl );
 
         session.getIoSession().write( resp );
@@ -586,7 +586,7 @@ public class SyncReplProvider implements
         syncStateControl.setSyncStateType( SyncStateTypeEnum.MODDN );
         syncStateControl.setEntryUUID( StringTools.uuidToBytes( uuid.getString() ) );
 
-        InternalResponse resp = generateResponse( session, req, entry );
+        Response resp = generateResponse( session, req, entry );
         resp.add( syncStateControl );
         resp.add( modDnControl );
         
@@ -595,7 +595,7 @@ public class SyncReplProvider implements
     }
 
     
-    private InternalResponse generateResponse( LdapSession session, InternalSearchRequest req, Entry entry )
+    private Response generateResponse( LdapSession session, InternalSearchRequest req, Entry entry )
         throws Exception
     {
         EntryAttribute ref = entry.get( SchemaConstants.REF_AT );
@@ -604,7 +604,7 @@ public class SyncReplProvider implements
         if ( ( ref != null ) && !hasManageDsaItControl )
         {
             // The entry is a referral.
-            InternalSearchResultReference respRef;
+            SearchResultReference respRef;
             respRef = new SearchResultReferenceImpl( req.getMessageId() );
             respRef.setReferral( new ReferralImpl() );
 
@@ -650,7 +650,7 @@ public class SyncReplProvider implements
         else
         {
             // The entry is not a referral, or the ManageDsaIt control is set
-            InternalSearchResultEntry respEntry;
+            SearchResultEntry respEntry;
             respEntry = new SearchResultEntryImpl( req.getMessageId() );
             respEntry.setEntry( entry );
             respEntry.setObjectName( entry.getDn() );
@@ -981,7 +981,7 @@ public class SyncReplProvider implements
     
     private void sendESyncRefreshRequired( LdapSession session, InternalSearchRequest req ) throws Exception
     {
-        InternalSearchResultDone searchDoneResp = ( InternalSearchResultDone ) req.getResultResponse();
+        SearchResultDone searchDoneResp = ( SearchResultDone ) req.getResultResponse();
         searchDoneResp.getLdapResult().setResultCode( ResultCodeEnum.E_SYNC_REFRESH_REQUIRED );
         SyncDoneValueControl syncDone = new SyncDoneValueControl();
         searchDoneResp.add( syncDone );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Sat Aug 14 14:18:49 2010
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.mina.core.future.WriteFuture;
 import org.slf4j.Logger;
@@ -141,7 +141,7 @@ public class SyncReplSearchListener impl
             if ( pushInRealTime )
             {
                 
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 
@@ -182,7 +182,7 @@ public class SyncReplSearchListener impl
         {
             if ( pushInRealTime )
             {
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 
@@ -221,7 +221,7 @@ public class SyncReplSearchListener impl
             if ( pushInRealTime )
             {
                 
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( modifyContext.getDn() );
                 respEntry.setEntry( alteredEntry );
 
@@ -269,7 +269,7 @@ public class SyncReplSearchListener impl
 
             if ( pushInRealTime )
             {
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( moveContext.getDn() );
                 respEntry.setEntry( entry );
 
@@ -320,7 +320,7 @@ public class SyncReplSearchListener impl
             {
                 Entry alteredEntry = moveAndRenameContext.getModifiedEntry();
                 
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( moveAndRenameContext.getModifiedEntry().getDn() );
                 respEntry.setEntry( alteredEntry );
 
@@ -364,7 +364,7 @@ public class SyncReplSearchListener impl
 
             if ( pushInRealTime )
             {
-                InternalSearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+                SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
                 respEntry.setObjectName( entry.getDn() );
                 respEntry.setEntry( entry );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Sat Aug 14 14:18:49 2010
@@ -86,7 +86,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
@@ -269,7 +269,7 @@ public class AddIT extends AbstractLdapT
         con.add( kate );
 
         // Analyze entry and description attribute
-        Entry kateReloaded = ( ( InternalSearchResultEntry ) con.lookup( dn ) ).getEntry();
+        Entry kateReloaded = ( ( SearchResultEntry ) con.lookup( dn ) ).getEntry();
         assertNotNull( kateReloaded );
         EntryAttribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
@@ -309,7 +309,7 @@ public class AddIT extends AbstractLdapT
         con.add( kate );
 
         // Analyze entry and description attribute
-        Entry kateReloaded = ( ( InternalSearchResultEntry ) con.lookup( dn ) ).getEntry();
+        Entry kateReloaded = ( ( SearchResultEntry ) con.lookup( dn ) ).getEntry();
         assertNotNull( kateReloaded );
         EntryAttribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
@@ -350,7 +350,7 @@ public class AddIT extends AbstractLdapT
         con.add( kate );
 
         // Analyze entry and description attribute
-        Entry kateReloaded = ( ( InternalSearchResultEntry ) con.lookup( dn ) ).getEntry();
+        Entry kateReloaded = ( ( SearchResultEntry ) con.lookup( dn ) ).getEntry();
         assertNotNull( kateReloaded );
         EntryAttribute attr = kateReloaded.get( "description" );
         assertNotNull( attr );
@@ -1205,7 +1205,7 @@ public class AddIT extends AbstractLdapT
         con.add( entry );
 
         // Analyze entry and description attribute
-        InternalSearchResultEntry resp = ( InternalSearchResultEntry ) con.lookup( dn, "*", "+" );
+        SearchResultEntry resp = ( SearchResultEntry ) con.lookup( dn, "*", "+" );
         Entry addedEntry = resp.getEntry();
         assertNotNull( addedEntry );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Sat Aug 14 14:18:49 2010
@@ -36,8 +36,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -90,12 +90,12 @@ public class AddingEntriesWithSpecialCha
         personEntry.setDn( new DN( dn ) );
         connection.add( personEntry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Kate#Bush)", SearchScope.SUBTREE, "*" );
+        Cursor<Response> cursor = connection.search( "ou=system", "(cn=Kate#Bush)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( personEntry.getDn().equals( sr.getDn() ) );
@@ -125,12 +125,12 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Bush, Kate)", SearchScope.SUBTREE, "*" );
+        Cursor<Response> cursor = connection.search( "ou=system", "(cn=Bush, Kate)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -159,12 +159,12 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Mackie \"The Knife\" Messer)",
+        Cursor<Response> cursor = connection.search( "ou=system", "(cn=Mackie \"The Knife\" Messer)",
             SearchScope.SUBTREE, "*" );
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
             EntryAttribute cn = sr.get( "cn" );
@@ -191,12 +191,12 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=AC\\5CDC)", SearchScope.SUBTREE, "*" );
+        Cursor<Response> cursor = connection.search( "ou=system", "(ou=AC\\5CDC)", SearchScope.SUBTREE, "*" );
         boolean entryFound = false;
 
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
 
@@ -225,13 +225,13 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection
+        Cursor<Response> cursor = connection
             .search( "ou=system", "(ou=East -> West)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -261,12 +261,12 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=Scissors 8<)", SearchScope.SUBTREE, "*" );
+        Cursor<Response> cursor = connection.search( "ou=system", "(ou=Scissors 8<)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -297,13 +297,13 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=semicolon group;)", SearchScope.SUBTREE,
+        Cursor<Response> cursor = connection.search( "ou=system", "(ou=semicolon group;)", SearchScope.SUBTREE,
             "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -333,13 +333,13 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=nomen=omen)", SearchScope.SUBTREE, "*" );
+        Cursor<Response> cursor = connection.search( "ou=system", "(ou=nomen=omen)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
 
         while ( cursor.next() )
         {
-            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Sat Aug 14 14:18:49 2010
@@ -61,7 +61,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.BindRequestImpl;
 import org.apache.directory.shared.ldap.message.MessageDecoder;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
 import org.apache.directory.shared.ldap.name.DN;
@@ -393,13 +393,13 @@ public class SaslBindIT extends Abstract
         BogusNtlmProvider provider = getNtlmProviderUsingReflection();
 
         NtlmSaslBindClient client = new NtlmSaslBindClient( SupportedSaslMechanisms.NTLM );
-        InternalBindResponse type2response = client.bindType1( "type1_test".getBytes() );
+        BindResponse type2response = client.bindType1( "type1_test".getBytes() );
         assertEquals( 1, type2response.getMessageId() );
         assertEquals( ResultCodeEnum.SASL_BIND_IN_PROGRESS, type2response.getLdapResult().getResultCode() );
         assertTrue( ArrayUtils.isEquals( "type1_test".getBytes(), provider.getType1Response() ) );
         assertTrue( ArrayUtils.isEquals( "challenge".getBytes(), type2response.getServerSaslCreds() ) );
 
-        InternalBindResponse finalResponse = client.bindType3( "type3_test".getBytes() );
+        BindResponse finalResponse = client.bindType3( "type3_test".getBytes() );
         assertEquals( 2, finalResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() );
         assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) );
@@ -422,13 +422,13 @@ public class SaslBindIT extends Abstract
         ntlmHandler.setNtlmProvider( provider );
 
         NtlmSaslBindClient client = new NtlmSaslBindClient( SupportedSaslMechanisms.GSS_SPNEGO );
-        InternalBindResponse type2response = client.bindType1( "type1_test".getBytes() );
+        BindResponse type2response = client.bindType1( "type1_test".getBytes() );
         assertEquals( 1, type2response.getMessageId() );
         assertEquals( ResultCodeEnum.SASL_BIND_IN_PROGRESS, type2response.getLdapResult().getResultCode() );
         assertTrue( ArrayUtils.isEquals( "type1_test".getBytes(), provider.getType1Response() ) );
         assertTrue( ArrayUtils.isEquals( "challenge".getBytes(), type2response.getServerSaslCreds() ) );
 
-        InternalBindResponse finalResponse = client.bindType3( "type3_test".getBytes() );
+        BindResponse finalResponse = client.bindType3( "type3_test".getBytes() );
         assertEquals( 2, finalResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() );
         assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) );
@@ -459,7 +459,7 @@ public class SaslBindIT extends Abstract
         }
 
 
-        InternalBindResponse bindType1( byte[] type1response ) throws Exception
+        BindResponse bindType1( byte[] type1response ) throws Exception
         {
             if ( !isConnected() )
             {
@@ -497,11 +497,11 @@ public class SaslBindIT extends Abstract
             }
 
             // Retrieve the response back from server to my last request.
-            return ( InternalBindResponse ) decoder.decode( null, _input_ );
+            return ( BindResponse ) decoder.decode( null, _input_ );
         }
 
 
-        InternalBindResponse bindType3( byte[] type3response ) throws Exception
+        BindResponse bindType3( byte[] type3response ) throws Exception
         {
             if ( !isConnected() )
             {
@@ -539,7 +539,7 @@ public class SaslBindIT extends Abstract
             }
 
             // Retrieve the response back from server to my last request.
-            return ( InternalBindResponse ) decoder.decode( null, _input_ );
+            return ( BindResponse ) decoder.decode( null, _input_ );
         }
     }
 

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sat Aug 14 14:18:49 2010
@@ -54,8 +54,8 @@ import org.apache.directory.server.core.
 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.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -445,8 +445,8 @@ public class SimpleBindIT extends Abstra
     {
         LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
-        InternalBindResponse response = connection.bind( "uid=\"admin\",ou=\"system\"", "secret" );
-        InternalLdapResult ldapResult = response.getLdapResult();
+        BindResponse response = connection.bind( "uid=\"admin\",ou=\"system\"", "secret" );
+        LdapResult ldapResult = response.getLdapResult();
         assertEquals( ResultCodeEnum.SUCCESS, ldapResult.getResultCode() );
         assertEquals( 1, response.getMessageId() );
         assertTrue( connection.isAuthenticated() );

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java Sat Aug 14 14:18:49 2010
@@ -49,7 +49,7 @@ import org.apache.directory.server.core.
 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.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -97,7 +97,7 @@ public class CompareIT extends AbstractL
         LdapConnection conn = getClientApiConnection( ldapServer );
 
         // comparison success
-        InternalCompareResponse resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu" );
+        CompareResponse resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu" );
         assertEquals( ResultCodeEnum.COMPARE_TRUE, resp.getLdapResult().getResultCode() );
 
         // comparison failure

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java Sat Aug 14 14:18:49 2010
@@ -45,7 +45,7 @@ import org.apache.directory.server.core.
 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.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -95,7 +95,7 @@ public class DeleteIT extends AbstractLd
         LdapConnection conn = getClientApiConnection( ldapServer );
 
         // delete failure on non-leaf entry
-        InternalDeleteResponse resp = conn.delete( "uid=akarasulu,ou=users,ou=system" );
+        DeleteResponse resp = conn.delete( "uid=akarasulu,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, resp.getLdapResult().getResultCode() );
 
         conn.unBind();
@@ -115,7 +115,7 @@ public class DeleteIT extends AbstractLd
         conn.delete( "ou=computers,uid=akarasulu,ou=users,ou=system" );
 
         // delete failure non-existant entry
-        InternalDeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
+        DeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
 
         conn.unBind();
@@ -132,7 +132,7 @@ public class DeleteIT extends AbstractLd
         LdapConnection conn = getClientApiConnection( ldapServer );
 
         // delete failure non-existent entry
-        InternalDeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
+        DeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
 
         conn.unBind();

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java Sat Aug 14 14:18:49 2010
@@ -41,8 +41,8 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -68,11 +68,11 @@ public class LookupPerfIT extends Abstra
     {
         LdapConnection connection = getClientApiConnection( ldapServer );
 
-        InternalResponse response = connection.lookup( "uid=admin,ou=system" );;
+        Response response = connection.lookup( "uid=admin,ou=system" );;
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
+        assertTrue( response instanceof SearchResultEntry );
 
-        InternalSearchResultEntry result = ( InternalSearchResultEntry ) response;
+        SearchResultEntry result = ( SearchResultEntry ) response;
 
         assertNotNull( result );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Sat Aug 14 14:18:49 2010
@@ -39,8 +39,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -87,11 +87,11 @@ public class IllegalModificationIT exten
         ModifyRequest modReq = new ModifyRequest( new DN( DN ) );
         modReq.add( "description", "" );
 
-        InternalModifyResponse resp = con.modify( modReq );
+        ModifyResponse resp = con.modify( modReq );
         assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, resp.getLdapResult().getResultCode() );
 
         // Check whether entry is unmodified, i.e. no description
-        Entry entry = ( ( InternalSearchResultEntry ) con.lookup( DN ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) con.lookup( DN ) ).getEntry();
         assertEquals( "description exists?", null, entry.get( "description" ) );
     }
 

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Sat Aug 14 14:18:49 2010
@@ -38,7 +38,7 @@ import org.apache.directory.server.core.
 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.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -122,7 +122,7 @@ public class MoveIT extends AbstractLdap
         LdapConnection con = getClientApiConnection( ldapServer );
 
         //now do something bad: make the parent a child of its own child 
-        InternalModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=child,ou=parent,ou=system" );
+        ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=child,ou=parent,ou=system" );
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, resp.getLdapResult().getResultCode() );
     }
 
@@ -134,7 +134,7 @@ public class MoveIT extends AbstractLdap
         LdapConnection con = getClientApiConnection( ldapServer );
 
         //now do something bad: try to move the entry to the same DN
-        InternalModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=parent,ou=system" );
+        ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=parent,ou=system" );
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, resp.getLdapResult().getResultCode() );
     }
 }

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Sat Aug 14 14:18:49 2010
@@ -64,7 +64,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -1600,7 +1600,7 @@ public class SearchIT extends AbstractLd
             }
 
             // Searches for all the entries in ou=system
-            Cursor<InternalResponse> cursor = asyncCnx
+            Cursor<Response> cursor = asyncCnx
                 .search( "ou=system", "(ObjectClass=*)", SearchScope.SUBTREE, "*" );
 
             // Now loop on all the elements found, and abandon after 10 elements returned
@@ -1660,7 +1660,7 @@ public class SearchIT extends AbstractLd
         req.setScope( SearchScope.SUBTREE );
         req.setSizeLimit( sizeLimit );
 
-        Cursor<InternalResponse> cursor = connection.search( req );
+        Cursor<Response> cursor = connection.search( req );
         long i = 0;
 
         while ( cursor.next() )
@@ -1682,7 +1682,7 @@ public class SearchIT extends AbstractLd
         req.setFilter( "(objectClass=*)" );
         req.setScope( SearchScope.SUBTREE );
 
-        Cursor<InternalResponse> cursor = connection.search( req );
+        Cursor<Response> cursor = connection.search( req );
         int count = 0;
 
         while ( cursor.next() )

Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java Sat Aug 14 14:18:49 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -71,7 +71,7 @@ public class SearchPerfIT extends Abstra
             connection.bind( "uid=admin,ou=system", "secret" );
 
             // Searches for all the entries in ou=system
-            Cursor<InternalResponse> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
+            Cursor<Response> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
                 SearchScope.OBJECT, "*" );
 
             int i = 0;

Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java Sat Aug 14 14:18:49 2010
@@ -60,8 +60,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
@@ -172,18 +172,18 @@ public class ImportCommand extends ToolC
                         InternalMessage message = ( ( LdapMessageContainer ) ldapMessageContainer )
                             .getInternalMessage();
 
-                        if ( message instanceof InternalBindResponse )
+                        if ( message instanceof BindResponse )
                         {
-                            InternalBindResponse resp = ( InternalBindResponse ) message;
+                            BindResponse resp = ( BindResponse ) message;
 
                             if ( resp.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
                             {
                                 System.out.println( "Error : " + resp.getLdapResult().getErrorMessage() );
                             }
                         }
-                        else if ( message instanceof InternalExtendedResponse )
+                        else if ( message instanceof ExtendedResponse )
                         {
-                            InternalExtendedResponse response = ( ( LdapMessageContainer ) ldapMessageContainer )
+                            ExtendedResponse response = ( ( LdapMessageContainer ) ldapMessageContainer )
                                 .getInternalExtendedResponse();
 
                             if ( response.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )



Mime
View raw message