directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985495 [3/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/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Sat Aug 14 14:18:49 2010
@@ -58,10 +58,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 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.InternalDeleteResponse;
-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.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+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.Ignore;
 import org.junit.Test;
@@ -234,15 +234,15 @@ public class SubentryServiceIT extends A
     {
         Map<String, Entry> results = new HashMap<String, Entry>();
 
-        Cursor<InternalResponse> responses = connection.search( dn, "(objectClass=*)", SearchScope.SUBTREE, "+", "*" );
+        Cursor<Response> responses = connection.search( dn, "(objectClass=*)", SearchScope.SUBTREE, "+", "*" );
 
         while ( responses.next() )
         {
-            InternalResponse response = responses.get();
+            Response response = responses.get();
 
-            if ( response instanceof InternalSearchResultEntry )
+            if ( response instanceof SearchResultEntry )
             {
-                Entry entry = ( ( InternalSearchResultEntry ) response ).getEntry();
+                Entry entry = ( ( SearchResultEntry ) response ).getEntry();
 
                 results.put( entry.getDn().getName(), entry );
             }
@@ -337,7 +337,7 @@ public class SubentryServiceIT extends A
             "subtreeSpecification: {}", // All the entry from the AP, including the AP
             "c-o: Test Org", "cn: testsubentryA" );
 
-        InternalAddResponse response = connection.add( subEntryA );
+        AddResponse response = connection.add( subEntryA );
 
         assertTrue( response.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS );
 
@@ -425,7 +425,7 @@ public class SubentryServiceIT extends A
         }
 
         // Now delete the AP-B subentry
-        InternalDeleteResponse deleteResponse = connection
+        DeleteResponse deleteResponse = connection
             .delete( "cn=testsubentryB,dc=AP-B,cn=A2,dc=AP-A,dc=test,ou=system" );
 
         // --------------------------------------------------------------------
@@ -453,7 +453,7 @@ public class SubentryServiceIT extends A
         LdapConnection connection = IntegrationUtils.getAdminConnection( service );
 
         Entry subEntry = getSubentry( "cn=testsubentry,ou=system" );
-        InternalAddResponse response = connection.add( subEntry );
+        AddResponse response = connection.add( subEntry );
 
         assertTrue( "should never get here: cannot create subentry under regular entries", response.getLdapResult()
             .getResultCode() == ResultCodeEnum.NO_SUCH_ATTRIBUTE );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Sat Aug 14 14:18:49 2010
@@ -44,9 +44,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-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.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.junit.After;
 import org.junit.Before;
@@ -99,7 +99,7 @@ public class LdapConnectionTest extends 
         LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         try
         {
-            InternalBindResponse bindResponse = connection.bind( ADMIN_DN, "secret" );
+            BindResponse bindResponse = connection.bind( ADMIN_DN, "secret" );
 
             assertNotNull( bindResponse );
 
@@ -139,15 +139,15 @@ public class LdapConnectionTest extends 
     @Test
     public void testLookup() throws Exception
     {
-        InternalResponse resp = connection.lookup( ADMIN_DN );
+        Response resp = connection.lookup( ADMIN_DN );
         assertNotNull( resp );
 
-        Entry entry = ( ( InternalSearchResultEntry ) resp ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) resp ).getEntry();
         assertNull( entry.get( SchemaConstants.ENTRY_UUID_AT ) );
 
         // perform lookup with operational attributes
         resp = connection.lookup( ADMIN_DN, "+", "*" );
-        entry = ( ( InternalSearchResultEntry ) resp ).getEntry();
+        entry = ( ( SearchResultEntry ) resp ).getEntry();
         assertNotNull( entry.get( SchemaConstants.ENTRY_UUID_AT ) );
     }
 
@@ -155,17 +155,17 @@ public class LdapConnectionTest extends 
     @Test
     public void searchByEntryUuid() throws Exception
     {
-        InternalResponse resp = connection.lookup( ADMIN_DN, "+" );
-        Entry entry = ( ( InternalSearchResultEntry ) resp ).getEntry();
+        Response resp = connection.lookup( ADMIN_DN, "+" );
+        Entry entry = ( ( SearchResultEntry ) resp ).getEntry();
 
         String uuid = entry.get( SchemaConstants.ENTRY_UUID_AT ).getString();
 
         EqualityNode<String> filter = new EqualityNode<String>( SchemaConstants.ENTRY_UUID_AT, new StringValue( uuid ) );
 
-        Cursor<InternalResponse> cursor = connection.search( ADMIN_DN, filter.toString(), SearchScope.SUBTREE, "+" );
+        Cursor<Response> cursor = connection.search( ADMIN_DN, filter.toString(), SearchScope.SUBTREE, "+" );
         cursor.next();
 
-        Entry readEntry = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+        Entry readEntry = ( ( SearchResultEntry ) cursor.get() ).getEntry();
         assertEquals( uuid, readEntry.get( SchemaConstants.ENTRY_UUID_AT ).getString() );
 
         cursor.close();
@@ -175,12 +175,12 @@ public class LdapConnectionTest extends 
     @Test
     public void testRetrieveBinaryAttibute() throws Exception
     {
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( "uid=admin,ou=system" ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( "uid=admin,ou=system" ) ).getEntry();
         assertFalse( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isBinary() );
 
         connection.loadSchema();
 
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( "uid=admin,ou=system" ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( "uid=admin,ou=system" ) ).getEntry();
         assertTrue( entry.get( SchemaConstants.USER_PASSWORD_AT ).get().isBinary() );
     }
 
@@ -204,12 +204,12 @@ public class LdapConnectionTest extends 
     @Test
     public void testSearchEmptyDNWithOneLevelScopeAndNoObjectClassPresenceFilter() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "", "(objectClass=*)", SearchScope.ONELEVEL, "*", "+" );
+        Cursor<Response> cursor = connection.search( "", "(objectClass=*)", SearchScope.ONELEVEL, "*", "+" );
         HashMap<String, Entry> map = new HashMap<String, Entry>();
 
         while ( cursor.next() )
         {
-            Entry result = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry result = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             map.put( result.getDn().getName(), result );
         }
 

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Sat Aug 14 14:18:49 2010
@@ -47,7 +47,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Before;
 import org.junit.Test;
@@ -116,7 +116,7 @@ public class LdapSSLConnectionTest exten
         try
         {
             connection = new LdapNetworkConnection( config );
-            InternalBindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
+            BindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
 
             assertNotNull( bindResponse );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Sat Aug 14 14:18:49 2010
@@ -40,8 +40,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 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.InternalSearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
@@ -125,7 +125,7 @@ public class ClientAbandonRequestTest ex
         // Launch the search now
         SearchFuture searchFuture = connection.searchAsync( sr );
 
-        InternalResponse searchResponse = null;
+        Response searchResponse = null;
         int count = 0;
 
         do
@@ -139,13 +139,13 @@ public class ClientAbandonRequestTest ex
                 break;
             }
         }
-        while ( !( searchResponse instanceof InternalSearchResultDone ) );
+        while ( !( searchResponse instanceof SearchResultDone ) );
 
         assertTrue( numEntries > count );
         assertTrue( searchFuture.isCancelled() );
 
         // Now do a simple synchronous search
-        Cursor<InternalResponse> results = connection.search( sr );
+        Cursor<Response> results = connection.search( sr );
 
         int n = -1;
 

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sat Aug 14 14:18:49 2010
@@ -45,9 +45,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.InternalSearchResultEntry;
+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.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.junit.After;
@@ -113,7 +113,7 @@ public class ClientAddRequestTest extend
 
         assertFalse( session.exists( dn ) );
 
-        InternalAddResponse response = connection.add( entry );
+        AddResponse response = connection.add( entry );
         assertNotNull( response );
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -136,7 +136,7 @@ public class ClientAddRequestTest extend
 
         try
         {
-            InternalAddResponse addResponse = addFuture.get( 1000, TimeUnit.MILLISECONDS );
+            AddResponse addResponse = addFuture.get( 1000, TimeUnit.MILLISECONDS );
 
             assertNotNull( addResponse );
             assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
@@ -177,7 +177,7 @@ public class ClientAddRequestTest extend
 
         connection.add( entry );
 
-        Entry loadedEntry = ( ( InternalSearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
+        Entry loadedEntry = ( ( SearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
 
         // successful for admin
         assertEquals( uuid, loadedEntry.get( SchemaConstants.ENTRY_UUID_AT ).getString() );
@@ -189,10 +189,10 @@ public class ClientAddRequestTest extend
         connection.unBind();
 
         // connect as non admin user and try to add entry with uuid and csn
-        InternalBindResponse bindResp = connection.bind( "cn=kayyagari,ou=system", "secret" );
+        BindResponse bindResp = connection.bind( "cn=kayyagari,ou=system", "secret" );
         assertEquals( ResultCodeEnum.SUCCESS, bindResp.getLdapResult().getResultCode() );
 
-        InternalAddResponse resp = connection.add( entry );
+        AddResponse resp = connection.add( entry );
         assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, resp.getLdapResult().getResultCode() );
     }
 

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Sat Aug 14 14:18:49 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
@@ -98,7 +98,7 @@ public class ClientCompareRequestTest ex
     {
         DN dn = new DN( "uid=admin,ou=system" );
 
-        InternalCompareResponse response = connection.compare( dn, SchemaConstants.UID_AT, "admin" );
+        CompareResponse response = connection.compare( dn, SchemaConstants.UID_AT, "admin" );
         assertNotNull( response );
         assertTrue( response.isTrue() );
 
@@ -126,7 +126,7 @@ public class ClientCompareRequestTest ex
 
         try
         {
-            InternalCompareResponse compareResponse = compareFuture.get( 1000, TimeUnit.MILLISECONDS );
+            CompareResponse compareResponse = compareFuture.get( 1000, TimeUnit.MILLISECONDS );
 
             assertNotNull( compareResponse );
             assertEquals( ResultCodeEnum.COMPARE_TRUE, compareResponse.getLdapResult().getResultCode() );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sat Aug 14 14:18:49 2010
@@ -46,7 +46,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
 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.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
@@ -129,7 +129,7 @@ public class ClientDeleteRequestTest ext
 
         assertTrue( session.exists( dn ) );
 
-        InternalDeleteResponse response = connection.delete( dn.getName() );
+        DeleteResponse response = connection.delete( dn.getName() );
         assertNotNull( response );
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -143,7 +143,7 @@ public class ClientDeleteRequestTest ext
         DN dn = new DN( "cn=child1,cn=parent,ou=system" ); // has children
         assertTrue( session.exists( dn ) );
 
-        InternalDeleteResponse response = connection.delete( dn.getName() );
+        DeleteResponse response = connection.delete( dn.getName() );
         assertNotNull( response );
         assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, response.getLdapResult().getResultCode() );
 
@@ -161,7 +161,7 @@ public class ClientDeleteRequestTest ext
 
         if ( connection.isControlSupported( "1.2.840.113556.1.4.805" ) )
         {
-            InternalDeleteResponse response = connection.deleteTree( dn );
+            DeleteResponse response = connection.deleteTree( dn );
             assertNotNull( response );
             assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -193,7 +193,7 @@ public class ClientDeleteRequestTest ext
             DeleteListener.class );
         deleteChildrenMethod.setAccessible( true );
 
-        InternalDeleteResponse response = ( InternalDeleteResponse ) deleteChildrenMethod.invoke( connection, dn, null,
+        DeleteResponse response = ( DeleteResponse ) deleteChildrenMethod.invoke( connection, dn, null,
             null );
         assertNotNull( response );
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -221,7 +221,7 @@ public class ClientDeleteRequestTest ext
 
         DeleteListener listener = new DeleteListener()
         {
-            public void entryDeleted( LdapAsyncConnection connection, InternalDeleteResponse response )
+            public void entryDeleted( LdapAsyncConnection connection, DeleteResponse response )
                 throws LdapException
             {
                 assertNotNull( response );
@@ -253,7 +253,7 @@ public class ClientDeleteRequestTest ext
 
         try
         {
-            InternalDeleteResponse deleteResponse = deleteFuture.get( 1000, TimeUnit.MILLISECONDS );
+            DeleteResponse deleteResponse = deleteFuture.get( 1000, TimeUnit.MILLISECONDS );
 
             assertNotNull( deleteResponse );
             assertEquals( ResultCodeEnum.SUCCESS, deleteResponse.getLdapResult().getResultCode() );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Sat Aug 14 14:18:49 2010
@@ -41,7 +41,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
@@ -98,7 +98,7 @@ public class ClientExtendedRequestTest e
     @Test
     public void testExtended() throws Exception
     {
-        InternalExtendedResponse response = connection.extended( StartTlsRequest.OID );
+        ExtendedResponse response = connection.extended( StartTlsRequest.OID );
         assertNotNull( response );
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
     }
@@ -113,7 +113,7 @@ public class ClientExtendedRequestTest e
 
         try
         {
-            InternalExtendedResponse extendedResponse = ( InternalExtendedResponse ) extendedFuture.get( 1000,
+            ExtendedResponse extendedResponse = ( ExtendedResponse ) extendedFuture.get( 1000,
                 TimeUnit.MILLISECONDS );
 
             assertNotNull( extendedResponse );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Sat Aug 14 14:18:49 2010
@@ -40,7 +40,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.entry.Entry;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.junit.After;
@@ -103,7 +103,7 @@ public class ClientModifyDnRequestTest e
     @Test
     public void testRename() throws Exception
     {
-        InternalModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString" );
+        ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString" );
         assertNotNull( resp );
         assertFalse( session.exists( new DN( dn ) ) );
         assertTrue( session.exists( new DN( "cn=modifyDnWithString,ou=system" ) ) );
@@ -113,7 +113,7 @@ public class ClientModifyDnRequestTest e
     @Test
     public void testRenameWithoutDeleteOldRdn() throws Exception
     {
-        InternalModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString", false );
+        ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString", false );
         assertNotNull( resp );
 
         DN oldDn = new DN( dn );
@@ -130,7 +130,7 @@ public class ClientModifyDnRequestTest e
     @Test
     public void testMove() throws Exception
     {
-        InternalModifyDnResponse resp = connection.move( dn, "ou=users,ou=system" );
+        ModifyDnResponse resp = connection.move( dn, "ou=users,ou=system" );
         assertNotNull( resp );
 
         DN oldDn = new DN( dn );
@@ -155,7 +155,7 @@ public class ClientModifyDnRequestTest e
 
         try
         {
-            InternalModifyDnResponse response = modifyDnFuture.get( 1000, TimeUnit.MILLISECONDS );
+            ModifyDnResponse response = modifyDnFuture.get( 1000, TimeUnit.MILLISECONDS );
 
             assertNotNull( response );
 

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sat Aug 14 14:18:49 2010
@@ -46,8 +46,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 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.apache.directory.shared.ldap.util.DateUtils;
 import org.junit.After;
@@ -191,7 +191,7 @@ public class ClientModifyRequestTest ext
 
         try
         {
-            InternalModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
+            ModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
 
             assertNotNull( response );
 
@@ -222,7 +222,7 @@ public class ClientModifyRequestTest ext
         ModifyRequest modReq = new ModifyRequest( dn );
         modReq.replace( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
 
-        InternalModifyResponse modResp = connection.modify( modReq );
+        ModifyResponse modResp = connection.modify( modReq );
         assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
 
         modReq = new ModifyRequest( dn );
@@ -248,10 +248,10 @@ public class ClientModifyRequestTest ext
         modReq.replace( SchemaConstants.MODIFIERS_NAME_AT, modifierName );
         modReq.replace( SchemaConstants.MODIFY_TIMESTAMP_AT, modifiedTime );
 
-        InternalModifyResponse modResp = connection.modify( modReq );
+        ModifyResponse modResp = connection.modify( modReq );
         assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
 
-        Entry loadedEntry = ( ( InternalSearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
+        Entry loadedEntry = ( ( SearchResultEntry ) connection.lookup( dn.getName(), "+" ) ).getEntry();
 
         assertEquals( modifierName, loadedEntry.get( SchemaConstants.MODIFIERS_NAME_AT ).getString() );
         assertEquals( modifiedTime, loadedEntry.get( SchemaConstants.MODIFY_TIMESTAMP_AT ).getString() );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sat Aug 14 14:18:49 2010
@@ -44,8 +44,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.ldap.exception.LdapException;
 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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -107,7 +107,7 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSyncBindRequest() throws Exception
     {
-        InternalBindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
+        BindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
 
         assertNotNull( bindResponse );
         assertNotNull( bindResponse.getLdapResult() );
@@ -136,7 +136,7 @@ public class SimpleBindRequestTest exten
 
             try
             {
-                InternalBindResponse bindResponse = bindFuture.get( 1000, TimeUnit.MILLISECONDS );
+                BindResponse bindResponse = bindFuture.get( 1000, TimeUnit.MILLISECONDS );
 
                 assertNotNull( bindResponse );
                 assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -163,7 +163,7 @@ public class SimpleBindRequestTest exten
             //System.out.println( "------------------Bind" + i + "-------------" );
 
             // Try with no parameters
-            InternalBindResponse bindResponse = connection.bind();
+            BindResponse bindResponse = connection.bind();
 
             assertNotNull( bindResponse );
             assertNotNull( bindResponse.getLdapResult() );
@@ -218,8 +218,8 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSimpleBindNoNamePassword() throws Exception
     {
-        InternalBindResponse response = connection.bind( ( String ) null, "abc" );
-        InternalLdapResult ldapResult = response.getLdapResult();
+        BindResponse response = connection.bind( ( String ) null, "abc" );
+        LdapResult ldapResult = response.getLdapResult();
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, ldapResult.getResultCode() );
         assertEquals( 1, response.getMessageId() );
         assertFalse( connection.isAuthenticated() );
@@ -233,8 +233,8 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSimpleBindUnauthenticated() throws Exception
     {
-        InternalBindResponse response = connection.bind( "uid=admin,ou=system", ( String ) null );
-        InternalLdapResult ldapResult = response.getLdapResult();
+        BindResponse response = connection.bind( "uid=admin,ou=system", ( String ) null );
+        LdapResult ldapResult = response.getLdapResult();
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, ldapResult.getResultCode() );
         assertEquals( 1, response.getMessageId() );
         assertFalse( connection.isAuthenticated() );
@@ -248,8 +248,8 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSimpleBindValid() throws Exception
     {
-        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() );
@@ -262,8 +262,8 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSimpleBindValidUserWrongPassword() throws Exception
     {
-        InternalBindResponse response = connection.bind( "uid=admin,ou=system", "badpassword" );
-        InternalLdapResult ldapResult = response.getLdapResult();
+        BindResponse response = connection.bind( "uid=admin,ou=system", "badpassword" );
+        LdapResult ldapResult = response.getLdapResult();
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, ldapResult.getResultCode() );
         assertEquals( 1, response.getMessageId() );
         assertFalse( connection.isAuthenticated() );
@@ -277,8 +277,8 @@ public class SimpleBindRequestTest exten
     @Test
     public void testSimpleBindInvalidUser() throws Exception
     {
-        InternalBindResponse response = connection.bind( "uid=wrong,ou=system", "secret" );
-        InternalLdapResult ldapResult = response.getLdapResult();
+        BindResponse response = connection.bind( "uid=wrong,ou=system", "secret" );
+        LdapResult ldapResult = response.getLdapResult();
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, ldapResult.getResultCode() );
         assertEquals( 1, response.getMessageId() );
         assertFalse( connection.isAuthenticated() );
@@ -292,15 +292,15 @@ public class SimpleBindRequestTest exten
     @Test
     public void testDoubleSimpleBindValid() throws Exception
     {
-        InternalBindResponse response1 = connection.bind( "uid=admin,ou=system", "secret" );
-        InternalLdapResult ldapResult1 = response1.getLdapResult();
+        BindResponse response1 = connection.bind( "uid=admin,ou=system", "secret" );
+        LdapResult ldapResult1 = response1.getLdapResult();
         assertEquals( ResultCodeEnum.SUCCESS, ldapResult1.getResultCode() );
         assertEquals( 1, response1.getMessageId() );
         assertTrue( connection.isAuthenticated() );
 
         // The messageId must have been incremented
-        InternalBindResponse response2 = connection.bind( "uid=admin,ou=system", "secret" );
-        InternalLdapResult ldapResult2 = response2.getLdapResult();
+        BindResponse response2 = connection.bind( "uid=admin,ou=system", "secret" );
+        LdapResult ldapResult2 = response2.getLdapResult();
         assertEquals( ResultCodeEnum.SUCCESS, ldapResult2.getResultCode() );
         assertEquals( 2, response2.getMessageId() );
         assertTrue( connection.isAuthenticated() );
@@ -311,8 +311,8 @@ public class SimpleBindRequestTest exten
         assertFalse( connection.isConnected() );
 
         // And Bind again. The messageId should be 1 
-        InternalBindResponse response3 = connection.bind( "uid=admin,ou=system", "secret" );
-        InternalLdapResult ldapResult3 = response3.getLdapResult();
+        BindResponse response3 = connection.bind( "uid=admin,ou=system", "secret" );
+        LdapResult ldapResult3 = response3.getLdapResult();
         assertEquals( ResultCodeEnum.SUCCESS, ldapResult3.getResultCode() );
         assertEquals( 1, response3.getMessageId() );
         assertTrue( connection.isAuthenticated() );
@@ -361,7 +361,7 @@ public class SimpleBindRequestTest exten
             Thread.sleep( 200 );
 
             // It will take 1 seconds to bind, let's send another bind request : it should fail
-            InternalBindResponse response = connection.bind( "uid=admin,ou=system", "secret" );
+            BindResponse response = connection.bind( "uid=admin,ou=system", "secret" );
 
             assertFalse( connection.isAuthenticated() );
             assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
@@ -369,7 +369,7 @@ public class SimpleBindRequestTest exten
             // Now get back the BindResponse
             try
             {
-                InternalBindResponse bindResponse = bindFuture.get( 2000, TimeUnit.MILLISECONDS );
+                BindResponse bindResponse = bindFuture.get( 2000, TimeUnit.MILLISECONDS );
 
                 assertNotNull( bindResponse );
                 assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
@@ -394,7 +394,7 @@ public class SimpleBindRequestTest exten
     public void testBindUserWhenAnonymous() throws Exception
     {
         // Bind anonymous
-        InternalBindResponse bindResponse = connection.bind();
+        BindResponse bindResponse = connection.bind();
 
         assertNotNull( bindResponse );
         assertNotNull( bindResponse.getLdapResult() );
@@ -429,7 +429,7 @@ public class SimpleBindRequestTest exten
     public void testBindUserWhenAlreadyBound() throws Exception
     {
         // Bind with some credentials
-        InternalBindResponse bindResponse = connection.bind( "uid=admin, ou=system", "secret" );
+        BindResponse bindResponse = connection.bind( "uid=admin, ou=system", "secret" );
 
         assertNotNull( bindResponse );
         assertNotNull( bindResponse.getLdapResult() );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Sat Aug 14 14:18:49 2010
@@ -43,9 +43,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.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.name.DN;
 import org.junit.After;
 import org.junit.Before;
@@ -120,7 +120,7 @@ public class ClientSearchRequestTest ext
             count++;
         }
 
-        InternalSearchResultDone done = cursor.getSearchDone();
+        SearchResultDone done = cursor.getSearchDone();
 
         assertNotNull( done );
         assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
@@ -131,12 +131,12 @@ public class ClientSearchRequestTest ext
     @Test
     public void testSearchEquality() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(objectclass=organizationalUnit)",
+        Cursor<Response> cursor = connection.search( "ou=system", "(objectclass=organizationalUnit)",
             SearchScope.ONELEVEL, "*", "+" );
         int count = 0;
         while ( cursor.next() )
         {
-            Entry entry = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
+            Entry entry = ( ( SearchResultEntry ) cursor.get() ).getEntry();
             assertNotNull( entry );
             count++;
         }
@@ -151,18 +151,18 @@ public class ClientSearchRequestTest ext
         SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL, "*",
             "+" );
         int count = 0;
-        InternalResponse searchResponse = null;
+        Response searchResponse = null;
 
         do
         {
-            searchResponse = ( InternalResponse ) searchFuture.get( 1000, TimeUnit.MILLISECONDS );
+            searchResponse = ( Response ) searchFuture.get( 1000, TimeUnit.MILLISECONDS );
             assertNotNull( searchResponse );
-            if ( !( searchResponse instanceof InternalSearchResultDone ) )
+            if ( !( searchResponse instanceof SearchResultDone ) )
             {
                 count++;
             }
         }
-        while ( !( searchResponse instanceof InternalSearchResultDone ) );
+        while ( !( searchResponse instanceof SearchResultDone ) );
 
         assertEquals( 5, count );
     }
@@ -178,19 +178,19 @@ public class ClientSearchRequestTest ext
         SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*ers*)", SearchScope.SUBTREE,
             "*", "+" );
         int count = 0;
-        InternalResponse searchResponse = null;
+        Response searchResponse = null;
 
         do
         {
-            searchResponse = ( InternalResponse ) searchFuture.get( 100000, TimeUnit.MILLISECONDS );
+            searchResponse = ( Response ) searchFuture.get( 100000, TimeUnit.MILLISECONDS );
             assertNotNull( searchResponse );
 
-            if ( !( searchResponse instanceof InternalSearchResultDone ) )
+            if ( !( searchResponse instanceof SearchResultDone ) )
             {
                 count++;
             }
         }
-        while ( !( searchResponse instanceof InternalSearchResultDone ) );
+        while ( !( searchResponse instanceof SearchResultDone ) );
 
         assertEquals( 3, count );
     }
@@ -206,7 +206,7 @@ public class ClientSearchRequestTest ext
         searchRequest.addAttributes( "*" );
 
         int count = 0;
-        Cursor<InternalResponse> cursor = connection.search( searchRequest );
+        Cursor<Response> cursor = connection.search( searchRequest );
 
         while ( cursor.next() )
         {

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Sat Aug 14 14:18:49 2010
@@ -36,8 +36,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.Entry;
 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.AfterClass;
 import org.junit.Before;
@@ -101,10 +101,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchAll() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "*", "+" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -115,8 +115,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 7, entry.size() );
@@ -138,10 +138,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchAllUsers() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "*" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -152,8 +152,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 3, entry.size() );
@@ -171,10 +171,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchAllOperationals() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "+" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -185,8 +185,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 4, entry.size() );
@@ -205,10 +205,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchAllUsersAndSomeOperationals() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "*", "entryCSN", "entryUUID" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -219,8 +219,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 5, entry.size() );
@@ -240,10 +240,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchAllOperationalAndSomeUsers() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "+", "cn", "sn" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -254,8 +254,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 6, entry.size() );
@@ -276,10 +276,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchSomeOpsAndUsers() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "cn", "entryUUID", "sn", "entryCSN" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -290,8 +290,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 4, entry.size() );
@@ -310,10 +310,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchWithDuplicatedAttrs() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "cn", "entryUUID", "cn", "sn", "entryCSN", "entryUUID" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -324,8 +324,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 4, entry.size() );
@@ -344,10 +344,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchWithOIDAndtext() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "cn", "1.3.6.1.1.16.4", "surName", "entryCSN", "entryUUID" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -358,8 +358,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 4, entry.size() );
@@ -378,10 +378,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchWithMissingAttributes() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "cn", "1.3.6.1.1.16.4", "gn", "entryCSN", "entryUUID" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -392,8 +392,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 3, entry.size() );
@@ -411,10 +411,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchNoAttributes() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "1.1" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -425,8 +425,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 0, entry.size() );
@@ -441,10 +441,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchNoAttributesAndAttributes() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "1.1", "cn" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -455,8 +455,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 1, entry.size() );
@@ -472,10 +472,10 @@ public class SearchRequestReturningAttri
     @Test
     public void testSearchNoAttributesAllAttributes() throws Exception
     {
-        Cursor<InternalResponse> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
+        Cursor<Response> cursor = connection.search( "cn=user1,ou=users,ou=system", "(objectclass=*)",
             SearchScope.OBJECT, "1.1", "*", "+" );
         int count = 0;
-        InternalResponse response = null;
+        Response response = null;
 
         while ( cursor.next() )
         {
@@ -486,8 +486,8 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNotNull( response );
-        assertTrue( response instanceof InternalSearchResultEntry );
-        InternalSearchResultEntry resultEntry = ( InternalSearchResultEntry ) response;
+        assertTrue( response instanceof SearchResultEntry );
+        SearchResultEntry resultEntry = ( SearchResultEntry ) response;
         Entry entry = resultEntry.getEntry();
 
         assertEquals( 7, entry.size() );

Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java Sat Aug 14 14:18:49 2010
@@ -42,8 +42,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -77,12 +77,12 @@ public class TestClientApiPerf extends A
 
         long t2 = System.currentTimeMillis();
 
-        Cursor<InternalResponse> cursor = connection.search( "dc=example,dc=com", "(objectClass=*)",
+        Cursor<Response> cursor = connection.search( "dc=example,dc=com", "(objectClass=*)",
             SearchScope.SUBTREE, "*" );
         while ( cursor.next() )
         {
-            InternalResponse sr = cursor.get();
-            InternalSearchResultEntry sre = ( InternalSearchResultEntry ) sr;
+            Response sr = cursor.get();
+            SearchResultEntry sre = ( SearchResultEntry ) sr;
         }
 
         cursor.close();

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.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/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Sat Aug 14 14:18:49 2010
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
 import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
 import org.apache.mina.core.service.IoHandler;
 import org.apache.mina.core.session.IoSession;
@@ -181,7 +181,7 @@ class LdapProtocolHandler extends Demuxi
             {
                 if ( control.isCritical() && !ldapServer.getSupportedControls().contains( control.getOid() ) )
                 {
-                    InternalResultResponse resp = req.getResultResponse();
+                    ResultResponse resp = req.getResultResponse();
                     resp.getLdapResult().setErrorMessage( "Unsupport critical control: " + control.getOid() );
                     resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
                     session.write( resp );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.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/LdapProtocolUtils.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Sat Aug 14 14:18:49 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.shared.ldap.message.internal.InternalRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 
 
 /**
@@ -55,7 +55,7 @@ public class LdapProtocolUtils implement
      * @param opContext the context to extract controls from
      * @param response the response to populate with response controls
      */
-    public static void setResponseControls( OperationContext opContext, InternalResponse response ) throws Exception
+    public static void setResponseControls( OperationContext opContext, Response response ) throws Exception
     {
         opContext.addRequestControls( opContext.getResponseControls() );
     }

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.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/AddHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java Sat Aug 14 14:18:49 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class AddHandler extends LdapRequ
     public void handle( LdapSession session, InternalAddRequest req ) 
     {
         LOG.debug( "Handling request: {}", req );
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.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/BindHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Sat Aug 14 14:18:49 2010
@@ -44,8 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 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.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -146,7 +146,7 @@ public class BindHandler extends LdapReq
             if ( principalEntry == null )
             {
                 LOG.info( "The {} principalDN cannot be found in the server : bind failure.", bindRequest.getName() );
-                InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+                LdapResult result = bindRequest.getResultResponse().getLdapResult();
                 result.setErrorMessage( "cannot bind the principalDn." );
                 result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
                 ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -157,7 +157,7 @@ public class BindHandler extends LdapReq
                 SchemaConstants.REFERRAL_OC ) )
             {
                 LOG.info( "Bind principalDn points to referral." );
-                InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+                LdapResult result = bindRequest.getResultResponse().getLdapResult();
                 result.setErrorMessage( "Bind principalDn points to referral." );
                 result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
                 ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -197,7 +197,7 @@ public class BindHandler extends LdapReq
             // For BindRequest, it should be an InvalidCredentials, 
             // no matter what kind of exception we got.
             ResultCodeEnum code = null;
-            InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+            LdapResult result = bindRequest.getResultResponse().getLdapResult();
 
             if ( e instanceof LdapUnwillingToPerformException )
             {
@@ -274,7 +274,7 @@ public class BindHandler extends LdapReq
     private void generateSaslChallengeOrComplete( LdapSession ldapSession, SaslServer ss,
         InternalBindRequest bindRequest ) throws Exception
     {
-        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+        LdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         // SaslServer will throw an exception if the credentials are null.
         if ( bindRequest.getCredentials() == null )
@@ -331,7 +331,7 @@ public class BindHandler extends LdapReq
 
                 // Build the response
                 result.setResultCode( ResultCodeEnum.SASL_BIND_IN_PROGRESS );
-                InternalBindResponse resp = ( InternalBindResponse ) bindRequest.getResultResponse();
+                BindResponse resp = ( BindResponse ) bindRequest.getResultResponse();
 
                 // Store the challenge
                 resp.setServerSaslCreds( tokenBytes );
@@ -362,7 +362,7 @@ public class BindHandler extends LdapReq
         ldapSession.setAnonymous();
 
         // And send the response to the client
-        InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+        LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
         bindResult.setResultCode( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
         bindResult.setErrorMessage( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED.toString() + ": "
             + bindRequest.getSaslMechanism() + " is not a supported mechanism." );
@@ -378,7 +378,7 @@ public class BindHandler extends LdapReq
      */
     private void sendInvalidCredentials( LdapSession ldapSession, InternalBindRequest bindRequest, Exception e )
     {
-        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
+        LdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         String message = "";
 
@@ -410,7 +410,7 @@ public class BindHandler extends LdapReq
     private void sendBindSuccess( LdapSession ldapSession, InternalBindRequest bindRequest, byte[] tokenBytes )
     {
         // Return the successful response
-        InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
+        BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
         response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
         response.setServerSaslCreds( tokenBytes );
 
@@ -590,7 +590,7 @@ public class BindHandler extends LdapReq
         if ( !bindRequest.getVersion3() )
         {
             LOG.error( I18n.err( I18n.ERR_162 ) );
-            InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+            LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
             bindResult.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             bindResult.setErrorMessage( I18n.err( I18n.ERR_163 ) );
             ldapSession.getIoSession().write( bindRequest.getResultResponse() );

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.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/CompareHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,7 +48,7 @@ public class CompareHandler extends Ldap
     public void handle( LdapSession session, InternalCompareRequest req )
     {
         LOG.debug( "Handling compare request while ignoring referrals: {}", req );
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
         
         try
         {

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.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/DeleteHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java Sat Aug 14 14:18:49 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@ public class DeleteHandler extends LdapR
     public void handle( LdapSession session, InternalDeleteRequest req )
     {
         LOG.debug( "Handling request: {}", req );
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.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/ExtendedHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Sat Aug 14 14:18:49 2010
@@ -25,8 +25,8 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.LdapSession;
 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;
 
 
 /**
@@ -45,7 +45,7 @@ public class ExtendedHandler extends Lda
             // As long as no extended operations are implemented, send appropriate
             // error back to the client.
             String msg = "Unrecognized extended operation EXTENSION_OID: " + req.getID();
-            InternalLdapResult result = req.getResultResponse().getLdapResult();
+            LdapResult result = req.getResultResponse().getLdapResult();
             result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( msg );
             session.getIoSession().write( req.getResultResponse() );
@@ -58,12 +58,12 @@ public class ExtendedHandler extends Lda
         }
         catch ( Exception e )
         {
-            InternalLdapResult result = req.getResultResponse().getLdapResult();
+            LdapResult result = req.getResultResponse().getLdapResult();
             result.setResultCode( ResultCodeEnum.OTHER );
             result.setErrorMessage( ResultCodeEnum.OTHER
                 + ": Extended operation handler for the specified EXTENSION_OID (" + req.getID()
                 + ") has failed to process your request:\n" + ExceptionUtils.getStackTrace( e ) );
-            InternalExtendedResponse resp = ( InternalExtendedResponse ) req.getResultResponse();
+            ExtendedResponse resp = ( ExtendedResponse ) req.getResultResponse();
             resp.setResponseValue( new byte[0] );
             session.getIoSession().write( req.getResultResponse() );
         }

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.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/LdapRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Sat Aug 14 14:18:49 2010
@@ -34,12 +34,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
 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.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-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.InternalRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.internal.ResultResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.mina.core.filterchain.IoFilterChain;
@@ -109,9 +109,9 @@ public abstract class LdapRequestHandler
     }
 
 
-    public void rejectWithoutConfidentiality( IoSession session, InternalResultResponse resp )
+    public void rejectWithoutConfidentiality( IoSession session, ResultResponse resp )
     {
-        InternalLdapResult result = resp.getLdapResult();
+        LdapResult result = resp.getLdapResult();
         result.setResultCode( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
         result.setErrorMessage( "Confidentiality (TLS secured connection) is required." );
         session.write( resp );
@@ -145,8 +145,8 @@ public abstract class LdapRequestHandler
                 || ldapSession.isSimpleAuthPending() )
             {
                 LOG.error( I18n.err( I18n.ERR_732 ) );
-                InternalBindResponse bindResponse = new BindResponseImpl( message.getMessageId() );
-                InternalLdapResult bindResult = bindResponse.getLdapResult();
+                BindResponse bindResponse = new BindResponseImpl( message.getMessageId() );
+                LdapResult bindResult = bindResponse.getLdapResult();
                 bindResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
                 bindResult.setErrorMessage( I18n.err( I18n.ERR_732 ) );
                 ldapSession.getIoSession().write( bindResponse );
@@ -240,7 +240,7 @@ public abstract class LdapRequestHandler
      */
     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/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.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/ModifyDnHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -59,7 +59,7 @@ public class ModifyDnHandler extends Lda
      */
     public void handle( LdapSession session, InternalModifyDnRequest req )
     {
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
         LOG.debug( "Handling modify dn request while ignoring referrals: {}", req );
 
         if ( req.getName().isEmpty() )

Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.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/ModifyHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java Sat Aug 14 14:18:49 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.InternalModifyRequest;
 
 import org.slf4j.Logger;
@@ -46,7 +46,7 @@ public class ModifyHandler extends LdapR
     public void handle( LdapSession session, InternalModifyRequest req )
     {
         LOG.debug( "Handling request : {}", req );
-        InternalLdapResult result = req.getResultResponse().getLdapResult();
+        LdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {



Mime
View raw message