directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985411 [9/11] - 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 00:22:40 GMT
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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -24,8 +24,6 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
-import org.apache.directory.ldap.client.api.message.SearchResultEntry;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -38,6 +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.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,12 +49,9 @@ import org.junit.runner.RunWith;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith( FrameworkRunner.class )
-@CreateLdapServer ( 
-    transports = 
-    {
-        @CreateTransport( protocol = "LDAP" )
-    })
+@RunWith(FrameworkRunner.class)
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
 public class AddingEntriesWithSpecialCharactersInRDNIT extends AbstractLdapTestUnit
 {
     private Entry getPersonEntry( String sn, String cn ) throws LdapException
@@ -63,7 +60,7 @@ public class AddingEntriesWithSpecialCha
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "person" );
         entry.add( SchemaConstants.CN_AT, cn );
         entry.add( SchemaConstants.SN_AT, sn );
-        
+
         return entry;
     }
 
@@ -73,7 +70,7 @@ public class AddingEntriesWithSpecialCha
         Entry entry = new DefaultEntry();
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.add( SchemaConstants.OU_AT, ou );
-        
+
         return entry;
     }
 
@@ -93,20 +90,20 @@ public class AddingEntriesWithSpecialCha
         personEntry.setDn( new DN( dn ) );
         connection.add( personEntry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(cn=Kate#Bush)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Kate#Bush)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
-            
+
             assertTrue( personEntry.getDn().equals( sr.getDn() ) );
             EntryAttribute cn = sr.get( "cn" );
             assertNotNull( cn );
             assertTrue( cn.contains( "Kate#Bush" ) );
         }
-        
+
         assertTrue( "entry found", entryFound );
 
         connection.delete( dn );
@@ -128,18 +125,18 @@ public class AddingEntriesWithSpecialCha
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(cn=Bush, Kate)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Bush, Kate)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
-            
+
             assertTrue( entry.getDn().equals( sr.getDn() ) );
             EntryAttribute cn = sr.get( "cn" );
             assertNotNull( cn );
-            
+
             assertTrue( cn.contains( "Bush, Kate" ) );
         }
 
@@ -156,18 +153,18 @@ public class AddingEntriesWithSpecialCha
     public void testAddingWithQuotesInRdn() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( ldapServer );
-        
+
         Entry entry = getPersonEntry( "Messer", "Mackie \"The Knife\" Messer" );
         String dn = "cn=Mackie \\\"The Knife\\\" Messer,ou=system";
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(cn=Mackie \"The Knife\" Messer)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(cn=Mackie \"The Knife\" Messer)",
+            SearchScope.SUBTREE, "*" );
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
             EntryAttribute cn = sr.get( "cn" );
@@ -176,7 +173,7 @@ public class AddingEntriesWithSpecialCha
         }
 
         assertTrue( "entry found", entryFound );
-        
+
         connection.delete( dn );
     }
 
@@ -188,21 +185,21 @@ public class AddingEntriesWithSpecialCha
     public void testAddingWithBackslashInRdn() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( ldapServer );
-        
+
         Entry entry = getOrgUnitEntry( "AC\\DC" );
         String dn = "ou=AC\\\\DC,ou=system";
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(ou=AC\\5CDC)", SearchScope.SUBTREE, "*" );
-        boolean entryFound= false;
-        
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=AC\\5CDC)", SearchScope.SUBTREE, "*" );
+        boolean entryFound = false;
+
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
             assertTrue( entry.getDn().equals( sr.getDn() ) );
-            
+
             EntryAttribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "AC\\DC" ) );
@@ -222,18 +219,19 @@ public class AddingEntriesWithSpecialCha
     public void testAddingWithGreaterSignInRdn() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( ldapServer );
-        
+
         Entry entry = getOrgUnitEntry( "East -> West" );
         String dn = "ou=East -\\> West,ou=system";
         entry.setDn( new DN( dn ) );
-        connection.add(  entry );
+        connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(ou=East -> West)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection
+            .search( "ou=system", "(ou=East -> West)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -261,23 +259,23 @@ public class AddingEntriesWithSpecialCha
         Entry entry = getOrgUnitEntry( "Scissors 8<" );
         String dn = "ou=Scissors 8\\<,ou=system";
         entry.setDn( new DN( dn ) );
-        connection.add(  entry );
+        connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(ou=Scissors 8<)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=Scissors 8<)", SearchScope.SUBTREE, "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
-            
+
             assertTrue( entry.getDn().equals( sr.getDn() ) );
 
             EntryAttribute ou = sr.get( "ou" );
             assertNotNull( ou );
             assertTrue( ou.contains( "Scissors 8<" ) );
         }
-        
+
         assertTrue( "entry found", entryFound );
 
         connection.delete( dn );
@@ -293,18 +291,19 @@ public class AddingEntriesWithSpecialCha
     public void testAddingWithSemicolonInRdn() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( ldapServer );
-        
+
         Entry entry = getOrgUnitEntry( "semicolon group;" );
         String dn = "ou=semicolon group\\;,ou=system";
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(ou=semicolon group;)", SearchScope.SUBTREE, "*" );
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=semicolon group;)", SearchScope.SUBTREE,
+            "*" );
 
         boolean entryFound = false;
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -312,7 +311,7 @@ public class AddingEntriesWithSpecialCha
             assertNotNull( ou );
             assertTrue( ou.contains( "semicolon group;" ) );
         }
-        
+
         assertTrue( "entry found", entryFound );
 
         connection.delete( dn );
@@ -328,19 +327,19 @@ public class AddingEntriesWithSpecialCha
     public void testAddingWithEqualsInRdn() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( ldapServer );
-        
+
         Entry entry = getOrgUnitEntry( "nomen=omen" );
         String dn = "ou=nomen\\=omen,ou=system";
         entry.setDn( new DN( dn ) );
         connection.add( entry );
 
-        Cursor<SearchResponse> cursor = connection.search( "ou=system", "(ou=nomen=omen)", SearchScope.SUBTREE, "*" );
-        
+        Cursor<InternalResponse> cursor = connection.search( "ou=system", "(ou=nomen=omen)", SearchScope.SUBTREE, "*" );
+
         boolean entryFound = false;
 
         while ( cursor.next() )
         {
-            Entry sr = ( ( SearchResultEntry ) cursor.get() ).getEntry();
+            Entry sr = ( ( InternalSearchResultEntry ) cursor.get() ).getEntry();
             entryFound = true;
 
             assertTrue( entry.getDn().equals( sr.getDn() ) );
@@ -348,9 +347,9 @@ public class AddingEntriesWithSpecialCha
             assertNotNull( ou );
             assertTrue( ou.contains( "nomen=omen" ) );
         }
-        
+
         assertTrue( "entry found", entryFound );
-        
+
         connection.delete( dn );
     }
 }
\ No newline at end of file

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -47,8 +47,6 @@ import netscape.ldap.LDAPUrl;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
-import org.apache.directory.ldap.client.api.message.BindResponse;
-import org.apache.directory.ldap.client.api.message.LdapResult;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
@@ -56,6 +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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -65,30 +65,21 @@ import org.junit.runner.RunWith;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
-@ApplyLdifs( {
-    // Entry # 1
-    "dn: uid=hnelson,ou=users,ou=system",
-    "objectClass: inetOrgPerson",
-    "objectClass: organizationalPerson",
-    "objectClass: person",
-    "objectClass: top",
-    "userPassword: secret",
-    "uid: hnelson",
-    "cn: Horatio Nelson",
-    "sn: Nelson"
-    }
-)
-@CreateDS( allowAnonAccess=true, name="SimpleBindIT-class")
-@CreateLdapServer ( 
-    transports = 
+@RunWith(FrameworkRunner.class)
+@ApplyLdifs(
     {
-        @CreateTransport( protocol = "LDAP" )
-    })
+        // Entry # 1
+        "dn: uid=hnelson,ou=users,ou=system", "objectClass: inetOrgPerson", "objectClass: organizationalPerson",
+        "objectClass: person", "objectClass: top", "userPassword: secret", "uid: hnelson", "cn: Horatio Nelson",
+        "sn: Nelson" })
+@CreateDS(allowAnonAccess = true, name = "SimpleBindIT-class")
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
 public class SimpleBindIT extends AbstractLdapTestUnit
 {
     private static final String BASE = "ou=users,ou=system";
 
+
     /**
      * Convenience method for creating a person.
      */
@@ -191,7 +182,7 @@ public class SimpleBindIT extends Abstra
         }
     }
 
-    
+
     /**
      * try to connect using a user with an invalid DN: we should get a invalidDNSyntax error.
      */
@@ -221,7 +212,7 @@ public class SimpleBindIT extends Abstra
         }
     }
 
-    
+
     /**
      * try to connect using a unknown user: we should get a invalidCredentials error.
      */
@@ -244,11 +235,11 @@ public class SimpleBindIT extends Abstra
         }
         catch ( NamingException e )
         {
-            fail( "Expected AuthenticationException with error code 49 for invalidate credentials instead got: " 
+            fail( "Expected AuthenticationException with error code 49 for invalidate credentials instead got: "
                 + e.getMessage() );
         }
     }
-    
+
 
     /**
      * covers the anonymous authentication : we should be able to read the rootDSE, but that's it
@@ -267,28 +258,30 @@ public class SimpleBindIT extends Abstra
         env.put( Context.SECURITY_PRINCIPAL, "" );
         env.put( Context.SECURITY_CREDENTIALS, "" );
 
-        String[] attrIDs = { "*", "+" };
-        
+        String[] attrIDs =
+            { "*", "+" };
+
         // Create the initial context
         try
         {
-            new InitialDirContext(env);
+            new InitialDirContext( env );
             fail();
         }
         catch ( NamingException ne )
         {
             // Expected, as the server forbid anonymous access
         }
-        
+
         // Check that we can read the rootDSE
         try
         {
             // Use the netscape API as JNDI cannot be used to do a search without
             // first binding.
-            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]{"vendorName"}, 0, "(ObjectClass=*)" );
+            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]
+                { "vendorName" }, 0, "(ObjectClass=*)" );
             LDAPSearchResults results = LDAPConnection.search( url );
 
-            if ( results.hasMoreElements() ) 
+            if ( results.hasMoreElements() )
             {
                 LDAPEntry entry = results.next();
 
@@ -318,8 +311,8 @@ public class SimpleBindIT extends Abstra
         {
             // Use the netscape API as JNDI cannot be used to do a search without
             // first binding.
-            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), 
-                "uid=admin,ou=system", attrIDs, 0, "(ObjectClass=*)" );
+            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "uid=admin,ou=system", attrIDs, 0,
+                "(ObjectClass=*)" );
             LDAPConnection.search( url );
 
             fail();
@@ -327,14 +320,14 @@ public class SimpleBindIT extends Abstra
         catch ( LDAPException e )
         {
             // Expected
-            assertTrue( true);
+            assertTrue( true );
         }
-        
+
         ldapServer.getDirectoryService().setAllowAnonymousAccess( oldValue );
         ldapServer.setAllowAnonymousAccess( oldValue );
     }
-    
-    
+
+
     /**
      * covers the Unauthenticated case : we should get a UnwillingToPerform error.
      */
@@ -351,7 +344,7 @@ public class SimpleBindIT extends Abstra
         // Create the initial context
         try
         {
-            new InitialDirContext(env);
+            new InitialDirContext( env );
         }
         catch ( OperationNotSupportedException onse )
         {
@@ -362,9 +355,9 @@ public class SimpleBindIT extends Abstra
         {
             fail();
         }
-    }    
-    
-    
+    }
+
+
     /**
      * not allowed by the server. We should get a invalidCredentials error.
      */
@@ -382,7 +375,7 @@ public class SimpleBindIT extends Abstra
         // Create the initial context
         try
         {
-            new InitialDirContext(env);
+            new InitialDirContext( env );
         }
         catch ( AuthenticationException ae )
         {
@@ -391,7 +384,7 @@ public class SimpleBindIT extends Abstra
         {
             fail( "Expected AuthenticationException but instead got: " + ne.getMessage() );
         }
-    }    
+    }
 
 
     /**
@@ -401,7 +394,7 @@ public class SimpleBindIT extends Abstra
     @Test
     public void testAnonymousRootDSESearch()
     {
-        
+
         boolean oldValue = ldapServer.getDirectoryService().isAllowAnonymousAccess();
         ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
 
@@ -409,10 +402,11 @@ public class SimpleBindIT extends Abstra
         {
             // Use the netscape API as JNDI cannot be used to do a search without
             // first binding.
-            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]{"vendorName"}, 0, "(ObjectClass=*)" );
+            LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]
+                { "vendorName" }, 0, "(ObjectClass=*)" );
             LDAPSearchResults results = LDAPConnection.search( url );
 
-            if ( results.hasMoreElements() ) 
+            if ( results.hasMoreElements() )
             {
                 LDAPEntry entry = results.next();
 
@@ -442,7 +436,7 @@ public class SimpleBindIT extends Abstra
         }
     }
 
-    
+
     /**
      * Tests bind operation on referral entry.
      */
@@ -450,9 +444,9 @@ public class SimpleBindIT extends Abstra
     public void testBindWithDoubleQuote() throws Exception
     {
         LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        
-        BindResponse response = connection.bind( "uid=\"admin\",ou=\"system\"", "secret" );
-        LdapResult ldapResult = response.getLdapResult();
+
+        InternalBindResponse response = connection.bind( "uid=\"admin\",ou=\"system\"", "secret" );
+        InternalLdapResult 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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -43,13 +43,13 @@ import netscape.ldap.LDAPResponse;
 import netscape.ldap.LDAPResponseListener;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.CompareResponse;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 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.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -61,43 +61,31 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
-@CreateLdapServer ( 
-    transports = 
-    {
-        @CreateTransport( protocol = "LDAP" )
-    })
-@ApplyLdifs( {
-    // Entry # 1
-    "dn: uid=akarasulu,ou=users,ou=system",
-    "objectClass: uidObject",
-    "objectClass: person",
-    "objectClass: top",
-    "uid: akarasulu",
-    "cn: Alex Karasulu",
-    "sn: karasulu", 
-    // Entry # 2
-    "dn: ou=Computers,uid=akarasulu,ou=users,ou=system",
-    "objectClass: organizationalUnit",
-    "objectClass: top",
-    "ou: computers",
-    "description: Computers for Alex",
-    "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system", 
-    // Entry # 3
-    "dn: uid=akarasuluref,ou=users,ou=system",
-    "objectClass: uidObject",
-    "objectClass: referral",
-    "objectClass: top",
-    "uid: akarasuluref",
-    "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system", 
-    "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
-    "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system"
-    }
-)
+@RunWith(FrameworkRunner.class)
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
+@ApplyLdifs(
+    {
+        // Entry # 1
+        "dn: uid=akarasulu,ou=users,ou=system", "objectClass: uidObject", "objectClass: person",
+        "objectClass: top",
+        "uid: akarasulu",
+        "cn: Alex Karasulu",
+        "sn: karasulu",
+        // Entry # 2
+        "dn: ou=Computers,uid=akarasulu,ou=users,ou=system", "objectClass: organizationalUnit", "objectClass: top",
+        "ou: computers",
+        "description: Computers for Alex",
+        "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system",
+        // Entry # 3
+        "dn: uid=akarasuluref,ou=users,ou=system", "objectClass: uidObject", "objectClass: referral",
+        "objectClass: top", "uid: akarasuluref", "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system" })
 public class CompareIT extends AbstractLdapTestUnit
 {
     private static final Logger LOG = LoggerFactory.getLogger( CompareIT.class );
-    
+
 
     /**
      * Tests normal compare operation on normal non-referral entries without 
@@ -107,19 +95,19 @@ public class CompareIT extends AbstractL
     public void testNormalCompare() throws Exception
     {
         LdapConnection conn = getClientApiConnection( ldapServer );
-        
+
         // comparison success
-        CompareResponse resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu" );
+        InternalCompareResponse resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu" );
         assertEquals( ResultCodeEnum.COMPARE_TRUE, resp.getLdapResult().getResultCode() );
 
         // comparison failure
         resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "lecharny" );
         assertEquals( ResultCodeEnum.COMPARE_FALSE, resp.getLdapResult().getResultCode() );
-        
+
         conn.unBind();
     }
-    
-    
+
+
     /**
      * Tests normal compare operation on normal non-referral entries without 
      * the ManageDsaIT control using an attribute that does not exist in the
@@ -129,14 +117,14 @@ public class CompareIT extends AbstractL
     public void testNormalCompareMissingAttribute() throws Exception
     {
         LDAPConnection conn = getWiredConnection( ldapServer );
-        
+
         // comparison success
         LDAPAttribute attribute = new LDAPAttribute( "sn", "karasulu" );
         assertTrue( conn.compare( "uid=akarasulu,ou=users,ou=system", attribute ) );
 
         // non-existing attribute
         attribute = new LDAPAttribute( "mail", "akarasulu@apache.org" );
-        
+
         try
         {
             conn.compare( "uid=akarasulu,ou=users,ou=system", attribute );
@@ -144,13 +132,13 @@ public class CompareIT extends AbstractL
         }
         catch ( LDAPException e )
         {
-            assertEquals( ResultCodeEnum.NO_SUCH_ATTRIBUTE.getValue(), e.getLDAPResultCode() ); 
+            assertEquals( ResultCodeEnum.NO_SUCH_ATTRIBUTE.getValue(), e.getLDAPResultCode() );
         }
-        
+
         conn.disconnect();
     }
-    
-    
+
+
     /**
      * Tests compare operation on referral entry with the ManageDsaIT control.
      */
@@ -162,7 +150,7 @@ public class CompareIT extends AbstractL
         constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         conn.setConstraints( constraints );
-        
+
         // comparison success
         LDAPAttribute attribute = new LDAPAttribute( "uid", "akarasuluref" );
         assertTrue( conn.compare( "uid=akarasuluref,ou=users,ou=system", attribute, constraints ) );
@@ -170,11 +158,11 @@ public class CompareIT extends AbstractL
         // comparison failure
         attribute = new LDAPAttribute( "uid", "elecharny" );
         assertFalse( conn.compare( "uid=akarasuluref,ou=users,ou=system", attribute, constraints ) );
-        
+
         conn.disconnect();
     }
-    
-    
+
+
     /**
      * Tests compare operation on normal and referral entries without the 
      * ManageDsaIT control. Referrals are sent back to the client with a
@@ -187,7 +175,7 @@ public class CompareIT extends AbstractL
         LDAPConstraints constraints = new LDAPConstraints();
         constraints.setReferrals( false );
         conn.setConstraints( constraints );
-        
+
         // comparison success
         LDAPAttribute attribute = new LDAPAttribute( "uid", "akarasulu" );
         assertTrue( conn.compare( "uid=akarasulu,ou=users,ou=system", attribute, constraints ) );
@@ -207,8 +195,8 @@ public class CompareIT extends AbstractL
 
         conn.disconnect();
     }
-    
-    
+
+
     /**
      * Tests compare operation on normal and referral entries without the 
      * ManageDsaIT control using JNDI instead of the Netscape API. Referrals 
@@ -221,10 +209,10 @@ public class CompareIT extends AbstractL
         SearchControls controls = new SearchControls();
         controls.setReturningAttributes( new String[0] );
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
-        
+
         // comparison success
-        NamingEnumeration<SearchResult> answer = ctx.search( "uid=akarasulu,ou=users,ou=system", 
-            "(uid=akarasulu)", controls );
+        NamingEnumeration<SearchResult> answer = ctx.search( "uid=akarasulu,ou=users,ou=system", "(uid=akarasulu)",
+            controls );
         assertTrue( answer.hasMore() );
         SearchResult result = answer.next();
         assertEquals( "", result.getName() );
@@ -235,8 +223,7 @@ public class CompareIT extends AbstractL
         // referrals failure
         try
         {
-            answer = ctx.search( "uid=akarasuluref,ou=users,ou=system", 
-                "(uid=akarasuluref)", controls );
+            answer = ctx.search( "uid=akarasuluref,ou=users,ou=system", "(uid=akarasuluref)", controls );
             fail( "Should never get here" );
         }
         catch ( ReferralException e )
@@ -247,8 +234,8 @@ public class CompareIT extends AbstractL
 
         ctx.close();
     }
-    
-    
+
+
     /**
      * Check that operation are not executed if we are now allowed to bind
      * anonymous
@@ -261,7 +248,7 @@ public class CompareIT extends AbstractL
         LDAPConnection conn = new LDAPConnection();
         conn.connect( "localhost", ldapServer.getPort() );
         LDAPAttribute attr = new LDAPAttribute( "uid", "admin" );
-        
+
         try
         {
             conn.compare( "uid=admin,ou=system", attr );
@@ -272,12 +259,12 @@ public class CompareIT extends AbstractL
             assertEquals( "no permission exception", 50, e.getLDAPResultCode() );
         }
     }
-    
-    
+
+
     /**
      * Tests referral handling when an ancestor is a referral.
      */
-    @Test 
+    @Test
     public void testAncestorReferral() throws Exception
     {
         LOG.debug( "" );
@@ -295,7 +282,8 @@ public class CompareIT extends AbstractL
         response = listener.getResponse();
         assertEquals( ResultCodeEnum.REFERRAL.getValue(), response.getResultCode() );
 
-        assertEquals( "ldap://localhost:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[0] );
+        assertEquals( "ldap://localhost:10389/ou=Computers,uid=akarasulu,ou=users,ou=system",
+            response.getReferrals()[0] );
         assertEquals( "ldap://foo:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[1] );
         assertEquals( "ldap://bar:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[2] );
 

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -39,13 +39,13 @@ import netscape.ldap.LDAPResponseListene
 import netscape.ldap.LDAPSearchConstraints;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.DeleteResponse;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 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.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -57,45 +57,34 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
-@CreateLdapServer ( 
-    transports = 
-    {
-        @CreateTransport( protocol = "LDAP" )
-    })
-@ApplyLdifs( {
-    // Entry # 1
-    "dn: uid=akarasulu,ou=users,ou=system",
-    "objectClass: uidObject",
-    "objectClass: person",
-    "objectClass: top",
-    "uid: akarasulu",
-    "cn: Alex Karasulu",
-    "sn: karasulu", 
-    
-    // Entry # 2
-    "dn: ou=Computers,uid=akarasulu,ou=users,ou=system",
-    "objectClass: organizationalUnit",
-    "objectClass: top",
-    "ou: computers",
-    "description: Computers for Alex",
-    "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system", 
-    
-    // Entry # 3
-    "dn: uid=akarasuluref,ou=users,ou=system",
-    "objectClass: uidObject",
-    "objectClass: referral",
-    "objectClass: top",
-    "uid: akarasuluref",
-    "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system", 
-    "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
-    "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system" 
-    }
-)
+@RunWith(FrameworkRunner.class)
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
+@ApplyLdifs(
+    {
+        // Entry # 1
+        "dn: uid=akarasulu,ou=users,ou=system", "objectClass: uidObject", "objectClass: person",
+        "objectClass: top",
+        "uid: akarasulu",
+        "cn: Alex Karasulu",
+        "sn: karasulu",
+
+        // Entry # 2
+        "dn: ou=Computers,uid=akarasulu,ou=users,ou=system", "objectClass: organizationalUnit", "objectClass: top",
+        "ou: computers",
+        "description: Computers for Alex",
+        "seeAlso: ou=Machines,uid=akarasulu,ou=users,ou=system",
+
+        // Entry # 3
+        "dn: uid=akarasuluref,ou=users,ou=system", "objectClass: uidObject", "objectClass: referral",
+        "objectClass: top", "uid: akarasuluref", "ref: ldap://localhost:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://foo:10389/uid=akarasulu,ou=users,ou=system",
+        "ref: ldap://bar:10389/uid=akarasulu,ou=users,ou=system" })
 public class DeleteIT extends AbstractLdapTestUnit
 {
     private static final Logger LOG = LoggerFactory.getLogger( DeleteIT.class );
 
+
     /**
      * Tests normal delete operation on normal non-referral entries without 
      * the ManageDsaIT control.
@@ -104,15 +93,15 @@ public class DeleteIT extends AbstractLd
     public void testNormalDeleteFailContextNotEmpty() throws Exception
     {
         LdapConnection conn = getClientApiConnection( ldapServer );
-        
+
         // delete failure on non-leaf entry
-        DeleteResponse resp = conn.delete( "uid=akarasulu,ou=users,ou=system" );
+        InternalDeleteResponse resp = conn.delete( "uid=akarasulu,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, resp.getLdapResult().getResultCode() );
 
         conn.unBind();
     }
-    
-    
+
+
     /**
      * Tests normal delete operation on normal non-referral entries without 
      * the ManageDsaIT control.
@@ -121,18 +110,18 @@ public class DeleteIT extends AbstractLd
     public void testNormalDelete() throws Exception
     {
         LdapConnection conn = getClientApiConnection( ldapServer );
-        
+
         // delete success
         conn.delete( "ou=computers,uid=akarasulu,ou=users,ou=system" );
 
         // delete failure non-existant entry
-        DeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
+        InternalDeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
-        
+
         conn.unBind();
     }
-    
-    
+
+
     /**
      * Tests normal delete operation on non-existent entries without 
      * the ManageDsaIT control.
@@ -141,15 +130,15 @@ public class DeleteIT extends AbstractLd
     public void testDeleteNonExistent() throws Exception
     {
         LdapConnection conn = getClientApiConnection( ldapServer );
-        
+
         // delete failure non-existent entry
-        DeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
+        InternalDeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
-        
+
         conn.unBind();
     }
-    
-    
+
+
     /**
      * Tests delete operation on referral entry with the ManageDsaIT control.
      */
@@ -161,10 +150,10 @@ public class DeleteIT extends AbstractLd
         constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         conn.setConstraints( constraints );
-        
+
         // delete success
         conn.delete( "uid=akarasuluref,ou=users,ou=system", constraints );
-        
+
         try
         {
             conn.read( "uid=akarasuluref,ou=users,ou=system", ( LDAPSearchConstraints ) constraints );
@@ -174,11 +163,11 @@ public class DeleteIT extends AbstractLd
         {
             assertEquals( ResultCodeEnum.NO_SUCH_OBJECT.getValue(), e.getLDAPResultCode() );
         }
-        
+
         conn.disconnect();
     }
-    
-    
+
+
     /**
      * Tests delete operation on normal and referral entries without the 
      * ManageDsaIT control. Referrals are sent back to the client with a
@@ -191,7 +180,7 @@ public class DeleteIT extends AbstractLd
         LDAPConstraints constraints = new LDAPConstraints();
         constraints.setReferrals( false );
         conn.setConstraints( constraints );
-        
+
         // referrals failure
         LDAPResponseListener listener = null;
         LDAPResponse response = null;
@@ -206,8 +195,8 @@ public class DeleteIT extends AbstractLd
 
         conn.disconnect();
     }
-    
-    
+
+
     /**
      * Tests delete operation on normal and referral entries without the 
      * ManageDsaIT control using JNDI instead of the Netscape API. Referrals 
@@ -217,10 +206,10 @@ public class DeleteIT extends AbstractLd
     public void testThrowOnReferralWithJndi() throws Exception
     {
         LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
-        
+
         // delete success
         ctx.destroySubcontext( "ou=computers,uid=akarasulu,ou=users,ou=system" );
-        
+
         try
         {
             ctx.lookup( "ou=computers,uid=akarasulu,ou=users,ou=system" );
@@ -244,12 +233,12 @@ public class DeleteIT extends AbstractLd
 
         ctx.close();
     }
-    
-    
+
+
     /**
      * Tests referral handling when an ancestor is a referral.
      */
-    @Test 
+    @Test
     public void testAncestorReferral() throws Exception
     {
         LOG.debug( "" );
@@ -266,30 +255,30 @@ public class DeleteIT extends AbstractLd
         response = listener.getResponse();
         assertEquals( ResultCodeEnum.REFERRAL.getValue(), response.getResultCode() );
 
-        assertEquals( "ldap://localhost:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[0] );
+        assertEquals( "ldap://localhost:10389/ou=Computers,uid=akarasulu,ou=users,ou=system",
+            response.getReferrals()[0] );
         assertEquals( "ldap://foo:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[1] );
         assertEquals( "ldap://bar:10389/ou=Computers,uid=akarasulu,ou=users,ou=system", response.getReferrals()[2] );
 
         conn.disconnect();
     }
-    
-    
+
 
     /**
      * Try to delete an entry with invalid DN. The operation fails
      * during parsing the given DN
      */
     @Test
-    public void testDeleteWithIllegalName() throws Exception 
+    public void testDeleteWithIllegalName() throws Exception
     {
         LdapConnection conn = getClientApiConnection( ldapServer );
-        
-        try 
+
+        try
         {
-            conn.delete("This is an illegal name,dc=example,dc=com" );
+            conn.delete( "This is an illegal name,dc=example,dc=com" );
             fail( "deletion should fail" );
-        } 
-        catch ( Exception e ) 
+        }
+        catch ( Exception e )
         {
             // expected
         }

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -32,8 +32,6 @@ import javax.naming.ldap.InitialLdapCont
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
-import org.apache.directory.ldap.client.api.message.SearchResultEntry;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.constants.ServerDNConstants;
@@ -43,6 +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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -53,15 +53,13 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateLdapServer(
-    transports =
-      { 
-        @CreateTransport(protocol = "LDAP") 
-      })
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
 public class LookupPerfIT extends AbstractLdapTestUnit
 {
     public static LdapServer ldapServer;
 
+
     /**
      * Evaluate the lookup operation performances
      */
@@ -70,37 +68,37 @@ public class LookupPerfIT extends Abstra
     {
         LdapConnection connection = getClientApiConnection( ldapServer );
 
-        SearchResponse response = connection.lookup( "uid=admin,ou=system" );;
+        InternalResponse response = connection.lookup( "uid=admin,ou=system" );;
         assertNotNull( response );
-        assertTrue( response instanceof SearchResultEntry );
-        
-        SearchResultEntry result = (SearchResultEntry)response;
+        assertTrue( response instanceof InternalSearchResultEntry );
+
+        InternalSearchResultEntry result = ( InternalSearchResultEntry ) response;
 
         assertNotNull( result );
-        
+
         Entry entry = result.getEntry();
-        
+
         assertNotNull( entry );
 
         long t0 = System.currentTimeMillis();
-        
+
         for ( int i = 0; i < 50; i++ )
         {
-            for ( int j = 0; j < 10000; j++)
+            for ( int j = 0; j < 10000; j++ )
             {
                 response = connection.lookup( "uid=admin,ou=system", "+" );
             }
-            
+
             System.out.print( "." );
         }
-        
+
         long t1 = System.currentTimeMillis();
-        
+
         System.out.println( "Delta : " + ( t1 - t0 ) );
         connection.close();
     }
-    
-    
+
+
     public static LdapContext getWiredContext( LdapServer ldapServer, Control[] controls ) throws Exception
     {
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -109,11 +107,11 @@ public class LookupPerfIT extends Abstra
         env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        
+
         return new InitialLdapContext( env, JndiUtils.toJndiControls( controls ) );
     }
 
-    
+
     /**
      * Evaluate the lookup operation performances
      */
@@ -121,27 +119,27 @@ public class LookupPerfIT extends Abstra
     public void testLookupPerfJNDI() throws Exception
     {
         LdapContext ctx = getWiredContext( ldapServer, null );
-        
+
         Attributes result = ctx.getAttributes( "uid=admin,ou=system" );
-        
+
         assertNotNull( result );
 
         long t0 = System.currentTimeMillis();
-        
+
         for ( int i = 0; i < 50; i++ )
         {
-            for ( int j = 0; j < 10000; j++)
+            for ( int j = 0; j < 10000; j++ )
             {
                 ctx.getAttributes( "uid=admin,ou=system" );
             }
-            
+
             System.out.print( "." );
         }
-        
+
         long t1 = System.currentTimeMillis();
-        
+
         System.out.println( "Delta : " + ( t1 - t0 ) );
-        
+
         ctx.close();
     }
 }

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -32,8 +32,6 @@ import netscape.ldap.LDAPModification;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.message.ModifyRequest;
-import org.apache.directory.ldap.client.api.message.ModifyResponse;
-import org.apache.directory.ldap.client.api.message.SearchResultEntry;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
@@ -41,6 +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.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,26 +66,19 @@ import org.junit.runner.RunWith;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
+@RunWith(FrameworkRunner.class)
 //@CreateDS( name="IllegalModificationIT-class", enableChangeLog=false )
-@CreateLdapServer ( 
-    transports = 
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
+@ApplyLdifs(
     {
-        @CreateTransport( protocol = "LDAP" )
-    })
-@ApplyLdifs( {
     // Entry # 1
-    "dn: cn=Kate Bush,ou=system",
-    "objectClass: person",
-    "objectClass: top",
-    "cn: Kate Bush",
-    "sn: Bush" 
-    }
-)
+        "dn: cn=Kate Bush,ou=system", "objectClass: person", "objectClass: top", "cn: Kate Bush", "sn: Bush" })
 public class IllegalModificationIT extends AbstractLdapTestUnit
 {
     private static final String DN = "cn=Kate Bush,ou=system";
 
+
     @Test
     public void testIllegalModification() throws Exception
     {
@@ -94,15 +87,15 @@ public class IllegalModificationIT exten
         ModifyRequest modReq = new ModifyRequest( new DN( DN ) );
         modReq.add( "description", "" );
 
-        ModifyResponse resp = con.modify( modReq );
+        InternalModifyResponse resp = con.modify( modReq );
         assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, resp.getLdapResult().getResultCode() );
 
         // Check whether entry is unmodified, i.e. no description
-        Entry entry = ( ( SearchResultEntry )con.lookup( DN ) ).getEntry();
+        Entry entry = ( ( InternalSearchResultEntry ) con.lookup( DN ) ).getEntry();
         assertEquals( "description exists?", null, entry.get( "description" ) );
     }
-    
-    
+
+
     @Test
     public void testIllegalModification2() throws Exception
     {
@@ -117,7 +110,8 @@ public class IllegalModificationIT exten
 
         try
         {
-            con.modify( "cn=Kate Bush,ou=system", new LDAPModification[] { mod, mod2 } );
+            con.modify( "cn=Kate Bush,ou=system", new LDAPModification[]
+                { mod, mod2 } );
             fail( "error expected due to empty attribute value" );
         }
         catch ( LDAPException e )

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -32,13 +32,13 @@ import javax.naming.directory.SearchResu
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.ModifyDnResponse;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 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.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 
-        ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=child,ou=parent,ou=system" );
+        InternalModifyDnResponse 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
-        ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=parent,ou=system" );
+        InternalModifyDnResponse 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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -49,7 +49,6 @@ import javax.naming.ldap.LdapContext;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
 import org.apache.directory.ldap.client.api.message.SearchRequest;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
@@ -65,6 +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.name.DN;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -79,11 +79,8 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateLdapServer(
-    transports =
-      { 
-        @CreateTransport(protocol = "LDAP") 
-      })
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
 @ApplyLdifs(
     {
 
@@ -1603,7 +1600,8 @@ public class SearchIT extends AbstractLd
             }
 
             // Searches for all the entries in ou=system
-            Cursor<SearchResponse> cursor = asyncCnx.search( "ou=system", "(ObjectClass=*)", SearchScope.SUBTREE, "*" );
+            Cursor<InternalResponse> cursor = asyncCnx
+                .search( "ou=system", "(ObjectClass=*)", SearchScope.SUBTREE, "*" );
 
             // Now loop on all the elements found, and abandon after 10 elements returned
             int count = 0;
@@ -1662,9 +1660,9 @@ public class SearchIT extends AbstractLd
         req.setScope( SearchScope.SUBTREE );
         req.setSizeLimit( sizeLimit );
 
-        Cursor<SearchResponse> cursor = connection.search( req );
+        Cursor<InternalResponse> cursor = connection.search( req );
         long i = 0;
-        
+
         while ( cursor.next() )
         {
             ++i;
@@ -1675,7 +1673,7 @@ public class SearchIT extends AbstractLd
 
 
     @Test
-    @Ignore( "This test is failing because of the timing issue. Note that the SearchHandler handles time based searches correctly, this is just the below test's problem" )
+    @Ignore("This test is failing because of the timing issue. Note that the SearchHandler handles time based searches correctly, this is just the below test's problem")
     public void testSearchTimeLimit() throws Exception, InterruptedException
     {
         LdapConnection connection = getClientApiConnection( ldapServer );
@@ -1684,20 +1682,20 @@ public class SearchIT extends AbstractLd
         req.setFilter( "(objectClass=*)" );
         req.setScope( SearchScope.SUBTREE );
 
-        Cursor<SearchResponse> cursor = connection.search( req );
+        Cursor<InternalResponse> cursor = connection.search( req );
         int count = 0;
-        
+
         while ( cursor.next() )
         {
             ++count;
         }
-        
+
         cursor.close();
 
         req.setTimeLimit( 1 );
         cursor = connection.search( req );
         int newCount = 0;
-        
+
         while ( cursor.next() )
         {
             ++newCount;

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=985411&r1=985410&r2=985411&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 00:22:38 2010
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -34,6 +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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -46,15 +46,13 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateLdapServer(
-    transports =
-      { 
-        @CreateTransport(protocol = "LDAP") 
-      })
+@CreateLdapServer(transports =
+    { @CreateTransport(protocol = "LDAP") })
 public class SearchPerfIT extends AbstractLdapTestUnit
 {
     public static LdapServer ldapServer;
 
+
     /**
      * test a search request perf.
      */
@@ -73,23 +71,26 @@ public class SearchPerfIT extends Abstra
             connection.bind( "uid=admin,ou=system", "secret" );
 
             // Searches for all the entries in ou=system
-            Cursor<SearchResponse> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)", SearchScope.OBJECT, "*" );
-            
+            Cursor<InternalResponse> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
+                SearchScope.OBJECT, "*" );
+
             int i = 0;
-            
+
             while ( cursor.next() )
             {
                 cursor.get();
                 ++i;
             }
-            
+
             cursor.close();
             assertEquals( 1, i );
 
             for ( int j = 0; j < 10000; j++ )
             {
                 cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)", SearchScope.OBJECT, "*" );
-                while ( cursor.next() ){}
+                while ( cursor.next() )
+                {
+                }
                 cursor.close();
             }
 
@@ -100,18 +101,21 @@ public class SearchPerfIT extends Abstra
             {
                 if ( j % 10000 == 0 )
                 {
-                    System.out.println(j);
+                    System.out.println( j );
                 }
 
                 cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)", SearchScope.OBJECT, "*" );
-                while ( cursor.next() ){}
+                while ( cursor.next() )
+                {
+                }
                 cursor.close();
             }
-            
+
             long t1 = System.currentTimeMillis();
-            
+
             Long deltaWarmed = ( t1 - t0 );
-            System.out.println( "Delta : " + deltaWarmed + "( " + ( ( nbIterations * 1000 ) / deltaWarmed ) + " per s ) /" + ( t1 - t0 ) );
+            System.out.println( "Delta : " + deltaWarmed + "( " + ( ( nbIterations * 1000 ) / deltaWarmed )
+                + " per s ) /" + ( t1 - t0 ) );
         }
         catch ( LdapException e )
         {

Modified: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=985411&r1=985410&r2=985411&view=diff
==============================================================================
--- directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java (original)
+++ directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java Sat Aug 14 00:22:38 2010
@@ -6,21 +6,13 @@ import java.util.List;
 
 import org.apache.directory.ldap.client.api.message.AbandonRequest;
 import org.apache.directory.ldap.client.api.message.AddRequest;
-import org.apache.directory.ldap.client.api.message.AddResponse;
 import org.apache.directory.ldap.client.api.message.BindRequest;
-import org.apache.directory.ldap.client.api.message.BindResponse;
 import org.apache.directory.ldap.client.api.message.CompareRequest;
-import org.apache.directory.ldap.client.api.message.CompareResponse;
 import org.apache.directory.ldap.client.api.message.DeleteRequest;
-import org.apache.directory.ldap.client.api.message.DeleteResponse;
 import org.apache.directory.ldap.client.api.message.ExtendedRequest;
-import org.apache.directory.ldap.client.api.message.ExtendedResponse;
 import org.apache.directory.ldap.client.api.message.ModifyDnRequest;
-import org.apache.directory.ldap.client.api.message.ModifyDnResponse;
 import org.apache.directory.ldap.client.api.message.ModifyRequest;
-import org.apache.directory.ldap.client.api.message.ModifyResponse;
 import org.apache.directory.ldap.client.api.message.SearchRequest;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
 import org.apache.directory.shared.asn1.primitives.OID;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.entry.Entry;
@@ -29,6 +21,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.InternalResponse;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -83,7 +83,7 @@ public interface LdapConnection
      * @param entry The entry to add
      * @result the add operation's response
      */
-    public abstract AddResponse add( Entry entry ) throws LdapException;
+    public abstract InternalAddResponse add( Entry entry ) throws LdapException;
 
 
     /**
@@ -93,7 +93,7 @@ public interface LdapConnection
      * @return the add operation's response
      * @throws LdapException
      */
-    public abstract AddResponse add( AddRequest addRequest ) throws LdapException;
+    public abstract InternalAddResponse add( AddRequest addRequest ) throws LdapException;
 
 
     /**
@@ -122,7 +122,7 @@ public interface LdapConnection
      *
      * @return The BindResponse LdapResponse
      */
-    public abstract BindResponse bind() throws LdapException, IOException;
+    public abstract InternalBindResponse bind() throws LdapException, IOException;
 
 
     /**
@@ -133,7 +133,7 @@ public interface LdapConnection
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      */
-    public abstract BindResponse bind( String name, String credentials ) throws LdapException, IOException;
+    public abstract InternalBindResponse bind( String name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -144,7 +144,7 @@ public interface LdapConnection
      * @param credentials The password. It can't be null
      * @return The BindResponse LdapResponse
      */
-    public abstract BindResponse bind( DN name, String credentials ) throws LdapException, IOException;
+    public abstract InternalBindResponse bind( DN name, String credentials ) throws LdapException, IOException;
 
 
     /**
@@ -154,7 +154,7 @@ public interface LdapConnection
      * parameters
      * @return A LdapResponse containing the result
      */
-    public abstract BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException;
+    public abstract InternalBindResponse bind( BindRequest bindRequest ) throws LdapException, IOException;
 
 
     /**
@@ -174,8 +174,8 @@ public interface LdapConnection
      * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE
      * @return A cursor on the result.
      */
-    public abstract Cursor<SearchResponse> search( DN baseDn, String filter, SearchScope scope,
-        String... attributes ) throws LdapException;
+    public abstract Cursor<InternalResponse> search( DN baseDn, String filter, SearchScope scope, String... attributes )
+        throws LdapException;
 
 
     /**
@@ -195,7 +195,7 @@ public interface LdapConnection
      * @param scope The sarch scope : OBJECT, ONELEVEL or SUBTREE
      * @return A cursor on the result.
      */
-    public abstract Cursor<SearchResponse> search( String baseDn, String filter, SearchScope scope,
+    public abstract Cursor<InternalResponse> search( String baseDn, String filter, SearchScope scope,
         String... attributes ) throws LdapException;
 
 
@@ -206,7 +206,7 @@ public interface LdapConnection
      * @return A {@link Cursor} containing Entries and Referencs
      * @throws LdapException @TODO
      */
-    public abstract Cursor<SearchResponse> search( SearchRequest searchRequest ) throws LdapException;
+    public abstract Cursor<InternalResponse> search( SearchRequest searchRequest ) throws LdapException;
 
 
     //------------------------ The LDAP operations ------------------------//
@@ -236,7 +236,7 @@ public interface LdapConnection
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException;
+    public abstract InternalModifyResponse modify( DN dn, Modification... modifications ) throws LdapException;
 
 
     /**
@@ -248,7 +248,7 @@ public interface LdapConnection
     * @return the modify operation's response
     * @throws LdapException in case of modify operation failure or timeout happens
     */
-   public abstract ModifyResponse modify( String dn, Modification... modifications ) throws LdapException;
+    public abstract InternalModifyResponse modify( String dn, Modification... modifications ) throws LdapException;
 
 
     /**
@@ -260,7 +260,7 @@ public interface LdapConnection
      * @return the modify operation's response
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract ModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException;
+    public abstract InternalModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException;
 
 
     /**
@@ -271,27 +271,28 @@ public interface LdapConnection
      * @return the modify operation's r"esponse
      * @throws LdapException in case of modify operation failure or timeout happens
      */
-    public abstract ModifyResponse modify( ModifyRequest modRequest ) throws LdapException;
+    public abstract InternalModifyResponse modify( ModifyRequest modRequest ) throws LdapException;
 
 
     /**
      * renames the given entryDn with new Rdn and deletes the old RDN.
      * @see #rename(String, String, boolean)
      */
-    public abstract ModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException;
 
 
     /**
      * renames the given entryDn with new RDN and deletes the old RDN.
      * @see #rename(DN, RDN, boolean)
      */
-    public abstract ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException;
 
 
     /**
      * @see #rename(DN, RDN, boolean)
      */
-    public abstract ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn )
+        throws LdapException;
 
 
     /**
@@ -305,13 +306,14 @@ public interface LdapConnection
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public abstract ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn )
+        throws LdapException;
 
 
     /**
      * @see #move(DN, DN)
      */
-    public abstract ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException;
+    public abstract InternalModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException;
 
 
     /**
@@ -322,7 +324,7 @@ public interface LdapConnection
      * @return modifyDn operations response
      * @throws LdapException
      */
-    public abstract ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException;
+    public abstract InternalModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException;
 
 
     /**
@@ -330,7 +332,7 @@ public interface LdapConnection
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public abstract ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException;
+    public abstract InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException;
 
 
     /**
@@ -338,7 +340,7 @@ public interface LdapConnection
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException;
+    public abstract InternalModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException;
 
 
     /**
@@ -348,7 +350,8 @@ public interface LdapConnection
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public abstract ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn )
+        throws LdapException;
 
 
     /**
@@ -358,7 +361,8 @@ public interface LdapConnection
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public abstract ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException;
+    public abstract InternalModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
+        throws LdapException;
 
 
     /**
@@ -369,7 +373,7 @@ public interface LdapConnection
      * @return modifyDn operations response, null if non-null listener is provided
      * @throws LdapException
      */
-    public abstract ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException;
+    public abstract InternalModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException;
 
 
     /**
@@ -378,7 +382,7 @@ public interface LdapConnection
      * @param dn the target entry's DN as a String
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract DeleteResponse delete( String dn ) throws LdapException;
+    public abstract InternalDeleteResponse delete( String dn ) throws LdapException;
 
 
     /**
@@ -387,7 +391,7 @@ public interface LdapConnection
      * @param dn the target entry's DN
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract DeleteResponse delete( DN dn ) throws LdapException;
+    public abstract InternalDeleteResponse delete( DN dn ) throws LdapException;
 
 
     /**
@@ -397,7 +401,7 @@ public interface LdapConnection
      * @return delete operation's response, null if a non-null listener value is provided
      * @throws LdapException If the DN is not valid or if the deletion failed
      */
-    public abstract DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
+    public abstract InternalDeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException;
 
 
     /**
@@ -410,7 +414,8 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( String dn, String attributeName, String value ) throws LdapException;
+    public abstract InternalCompareResponse compare( String dn, String attributeName, String value )
+        throws LdapException;
 
 
     /**
@@ -423,7 +428,8 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException;
+    public abstract InternalCompareResponse compare( String dn, String attributeName, byte[] value )
+        throws LdapException;
 
 
     /**
@@ -436,7 +442,8 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException;
+    public abstract InternalCompareResponse compare( String dn, String attributeName, Value<?> value )
+        throws LdapException;
 
 
     /**
@@ -449,7 +456,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException;
+    public abstract InternalCompareResponse compare( DN dn, String attributeName, String value ) throws LdapException;
 
 
     /**
@@ -462,7 +469,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException;
+    public abstract InternalCompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException;
 
 
     /**
@@ -475,7 +482,7 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException;
+    public abstract InternalCompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException;
 
 
     /**
@@ -485,25 +492,25 @@ public interface LdapConnection
      * @return compare operation's response
      * @throws LdapException
      */
-    public abstract CompareResponse compare( CompareRequest compareRequest ) throws LdapException;
+    public abstract InternalCompareResponse compare( CompareRequest compareRequest ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract ExtendedResponse extended( String oid ) throws LdapException;
+    public abstract InternalExtendedResponse extended( String oid ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract ExtendedResponse extended( String oid, byte[] value ) throws LdapException;
+    public abstract InternalExtendedResponse extended( String oid, byte[] value ) throws LdapException;
 
 
     /**
      * @see #extended(OID, byte[])
      */
-    public abstract ExtendedResponse extended( OID oid ) throws LdapException;
+    public abstract InternalExtendedResponse extended( OID oid ) throws LdapException;
 
 
     /**
@@ -514,7 +521,7 @@ public interface LdapConnection
      * @return extended operation's response
      * @throws LdapException
      */
-    public abstract ExtendedResponse extended( OID oid, byte[] value ) throws LdapException;
+    public abstract InternalExtendedResponse extended( OID oid, byte[] value ) throws LdapException;
 
 
     /**
@@ -524,19 +531,19 @@ public interface LdapConnection
      * @return Extended operation's response
      * @throws LdapException If the DN is not valid or if the extended operation failed
      */
-    public abstract ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
+    public abstract InternalExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException;
 
 
     /**
      * @see #lookup(DN, String...)
      */
-    public abstract SearchResponse lookup( DN dn ) throws LdapException;
+    public abstract InternalResponse lookup( DN dn ) throws LdapException;
 
 
     /**
      * @see #lookup(String, String...)
      */
-    public abstract SearchResponse lookup( String dn ) throws LdapException;
+    public abstract InternalResponse lookup( String dn ) throws LdapException;
 
 
     /**
@@ -547,7 +554,7 @@ public interface LdapConnection
      * @return the Entry with the given DN or null if no entry exists with that DN
      * @throws LdapException in case of any problems while searching for the DN
      */
-    public abstract SearchResponse lookup( DN dn, String... attributes ) throws LdapException;
+    public abstract InternalResponse lookup( DN dn, String... attributes ) throws LdapException;
 
 
     /**
@@ -558,7 +565,7 @@ public interface LdapConnection
      * @return the Entry with the given DN or null if no entry exists with that DN
      * @throws LdapException in case of any problems while searching for the DN
      */
-    public abstract SearchResponse lookup( String dn, String... attributes ) throws LdapException;
+    public abstract InternalResponse lookup( String dn, String... attributes ) throws LdapException;
 
 
     /**



Mime
View raw message