directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r784530 [4/5] - in /directory: apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/ apacheds/trunk/core/src/test/java/org/apache/directory/serv...
Date Sun, 14 Jun 2009 09:14:34 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java Sun Jun 14 09:14:31 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -77,7 +77,7 @@
     private static final String RDN = "cn=Tori Amos";
 
     
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
     /**
      * Enable the krb5kdc schema.
@@ -85,7 +85,7 @@
      @Before
     public void setUp() throws Exception
     {
-        DirContext schemaRoot = ( DirContext ) getWiredContext( ldapService ).lookup( "ou=schema" );
+        DirContext schemaRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( "ou=schema" );
 
         // -------------------------------------------------------------------
         // Enable the krb5kdc schema
@@ -156,7 +156,7 @@
     @Test
     public void testRemoveAttemptWithoutChange() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Get the attributes and check the contents
         Attributes tori = ctx.getAttributes( RDN );
@@ -199,7 +199,7 @@
     @Test
     public void testRemoveNotRequiredAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove description Attribute
         Attribute attr = new BasicAttribute( "description" );
@@ -223,7 +223,7 @@
     @Test
     public void testRemoveTwoNotRequiredAttributes() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // add telephoneNumber to entry
         Attributes tn = new BasicAttributes( "telephoneNumber", "12345678", true );
@@ -253,7 +253,7 @@
     @Test
     public void testRemoveRequiredAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove sn attribute
         Attribute attr = new BasicAttribute( "sn" );
@@ -280,7 +280,7 @@
     @Test
     public void testRemovePartOfRdn() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove sn attribute
         Attribute attr = new BasicAttribute( "cn" );
@@ -307,7 +307,7 @@
     @Test
     public void testRemovePartOfRdnNotRequired() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Change RDN to another attribute
         String newRdn = "description=an American singer-songwriter";
@@ -344,7 +344,7 @@
     @Test
     public void testRemoveAttributeNotPresent() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove telephoneNumber Attribute
         Attribute attr = new BasicAttribute( "telephoneNumber" );
@@ -372,7 +372,7 @@
     @Test
     public void testRemoveAttributeValueNotPresent() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove telephoneNumber Attribute
         Attribute attr = new BasicAttribute( "telephoneNumber", "12345" );
@@ -402,7 +402,7 @@
     @Test
     public void testRemoveAttributeNotValid() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Remove phantasy attribute
         Attribute attr = new BasicAttribute( "XXX" );
@@ -431,7 +431,7 @@
     @Test
     public void testReplaceNonExistingAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getInetOrgPersonAttributes( "Bush", "Kate Bush" );
@@ -477,7 +477,7 @@
     @Test
     public void testReplaceRdnByEmptyValueAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -509,7 +509,7 @@
     @Test
     public void testRemoveRdnAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -541,7 +541,7 @@
     @Test
     public void testRemoveRdnAttributeValue() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -573,7 +573,7 @@
     @Test
     public void testDeleteOclAttrWithTopPersonOrganizationalpersonInetorgperson() throws Exception 
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getInetOrgPersonAttributes("Bush", "Kate Bush");
@@ -606,7 +606,7 @@
     @Test
     public void testDeleteOclAttrWithTopPersonOrganizationalpersonInetorgpersonVariant() throws Exception 
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an entry
         Attributes attrs = getInetOrgPersonAttributes("Bush", "Kate Bush");
@@ -635,7 +635,7 @@
     @Test
     public void testRemoveObjectClassAndMandatoryAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // add objectClass:krb5Principal and krb5PrincipalName:test to entry
         Attributes tn = new BasicAttributes( true );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java Sun Jun 14 09:14:31 2009
@@ -49,7 +49,7 @@
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
@@ -102,12 +102,12 @@
 {
     private static final String BASE = "ou=system";
 
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
     
     public static class Factory implements LdapServerFactory
     {
-        public LdapService newInstance() throws Exception
+        public LdapServer newInstance() throws Exception
         {
             DirectoryService service = new DefaultDirectoryService();
             IntegrationUtils.doDelete( service.getWorkingDirectory() );
@@ -133,12 +133,12 @@
             // on the system and somewhere either under target directory
             // or somewhere in a temp area of the machine.
 
-            LdapService ldapService = new LdapService();
-            ldapService.setDirectoryService( service );
+            LdapServer ldapServer = new LdapServer();
+            ldapServer.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
-            ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.addExtendedOperationHandler( new StartTlsHandler() );
-            ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
+            ldapServer.setTransports( new TcpTransport( port ) );
+            ldapServer.addExtendedOperationHandler( new StartTlsHandler() );
+            ldapServer.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
 
             // Setup SASL Mechanisms
             
@@ -158,9 +158,9 @@
             mechanismHandlerMap.put( SupportedSaslMechanisms.NTLM, ntlmMechanismHandler );
             mechanismHandlerMap.put( SupportedSaslMechanisms.GSS_SPNEGO, ntlmMechanismHandler );
 
-            ldapService.setSaslMechanismHandlers( mechanismHandlerMap );
+            ldapServer.setSaslMechanismHandlers( mechanismHandlerMap );
 
-            return ldapService;
+            return ldapServer;
         }
     }
     
@@ -170,7 +170,7 @@
     @Test
     public void testReplaceToRemoveNotPresentAttribute() throws Exception
     {
-        DirContext sysRoot = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         String rdn = "cn=Kate Bush";
 
@@ -206,7 +206,7 @@
     @Test
     public void testReplaceToAddNotPresentAttribute() throws Exception 
     {
-        DirContext sysRoot = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         String rdn = "cn=Kate Bush";
 
@@ -244,7 +244,7 @@
     @Test
     public void testReplaceNonExistingAttribute() throws Exception 
     {
-        DirContext sysRoot = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         String rdn = "cn=Kate Bush";
 
@@ -278,7 +278,7 @@
     @Test
     public void testReplaceNonExistingAttributeManyMods() throws Exception 
     {
-        DirContext sysRoot = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         String rdn = "cn=Kate Bush";
 
@@ -313,10 +313,10 @@
     @Test
     public void testReplaceNonExistingIndexedAttribute() throws Exception 
     {
-        DirContext sysRoot = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         String rdn = "cn=Kim Wilde";
-        //ldapService.getDirectoryService().getPartitions();
+        //ldapServer.getDirectoryService().getPartitions();
 
         Attribute attr = new BasicAttribute( "ou", "test" );
         ModificationItem item = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
@@ -349,7 +349,7 @@
     @Test
     public void testReplaceCaseOfAttributeDescription() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         String rdn = "cn=Kate Bush";
 
         // Replace telephoneNumber

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java Sun Jun 14 09:14:31 2009
@@ -36,7 +36,7 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -100,7 +100,7 @@
 {
     private static final Logger LOG = LoggerFactory.getLogger( ModifyDnReferralIT.class );
     
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
 
     /**
@@ -109,7 +109,7 @@
     @Test
     public void testOnReferralWithManageDsaITControl() throws Exception
     {
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPSearchConstraints();
         constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -132,7 +132,7 @@
     @Test
     public void testNewSuperiorOnReferralWithManageDsaITControl() throws Exception
     {
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPSearchConstraints();
         constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
         constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -161,7 +161,7 @@
     @Test
     public void testOnReferral() throws Exception
     {
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPConstraints();
         constraints.setReferrals( false );
         conn.setConstraints( constraints );
@@ -190,7 +190,7 @@
     @Test
     public void testNewSupierorOnReferral() throws Exception
     {
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPConstraints();
         constraints.setReferrals( false );
         conn.setConstraints( constraints );
@@ -218,7 +218,7 @@
     @Test
     public void testThrowOnReferralWithJndi() throws Exception
     {
-        LdapContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
         
         // ModifyDN referrals failure
         try
@@ -244,7 +244,7 @@
     {
         LOG.debug( "" );
 
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPConstraints();
         conn.setConstraints( constraints );
 
@@ -272,7 +272,7 @@
     {
         LOG.debug( "" );
 
-        LDAPConnection conn = getWiredConnection( ldapService );
+        LDAPConnection conn = getWiredConnection( ldapServer );
         LDAPConstraints constraints = new LDAPConstraints();
         conn.setConstraints( constraints );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Sun Jun 14 09:14:31 2009
@@ -36,7 +36,7 @@
 import org.apache.directory.server.core.integ.Level;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -61,7 +61,7 @@
 {
     private static final String BASE = "ou=system";
 
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
     
     /**
@@ -105,7 +105,7 @@
     @Test
     public void testModifyRdnAndDeleteOld() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String oldCn = "Myra Ellen Amos";
@@ -154,7 +154,7 @@
     @Test
     public void testModifyRdnAndDontDeleteOldFalse() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String oldCn = "Myra Ellen Amos";
@@ -201,7 +201,7 @@
     @Test
     public void testModifyRdnAndKeepOld() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String oldCn = "Myra Ellen Amos";
@@ -249,7 +249,7 @@
     @Test
     public void testModifyRdnAndDeleteOldVariant() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String oldCn = "Myra Ellen Amos";
@@ -304,7 +304,7 @@
     @Test
     public void testModifyRdnDifferentAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String cnVal = "Tori Amos";
@@ -354,7 +354,7 @@
     @Test
     public void testModifyRdnDifferentAttributeDeleteOldFails() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person, cn value is rdn
         String cnVal = "Tori Amos";
@@ -389,7 +389,7 @@
     @Test
     public void testModifyRdnAndDeleteOldWithChild() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create an organizational unit, ou value is rdn
         String oldOu = "Writers";
@@ -459,7 +459,7 @@
     @Test
     public void testModifyRdnWithEncodedNewRdn() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person "cn=Tori Amos", cn value is rdn
         String cnVal = "Tori Amos";
@@ -512,7 +512,7 @@
     @Test
     public void testModifyRdnWithEscapedPoundNewRdn() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // Create a person "cn=Tori Amos", cn value is rdn
         String cnVal = "Tori Amos";
@@ -566,7 +566,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant1() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn" );
         String oldRdn = getRdn( attributes, "cn" );
@@ -606,7 +606,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant2() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn" );
         String oldRdn = getRdn( attributes, "cn" );
@@ -646,7 +646,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant3() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "description" );
         String oldRdn = getRdn( attributes, "description" );
@@ -686,7 +686,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant4() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "description" );
         String oldRdn = getRdn( attributes, "description" );
@@ -728,7 +728,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant5() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn" );
         attributes.put( "telephoneNumber", "12345" );
@@ -774,7 +774,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant6() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn" );
         attributes.put( "telephoneNumber", "12345" );
@@ -834,7 +834,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant7() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn", "sn" );
         String oldRdn = getRdn( attributes, "cn", "sn" );
@@ -876,7 +876,7 @@
     @Test
     public void testModifyMultiValuedRdnVariant8() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = createPerson( "cn", "sn" );
         String oldRdn = getRdn( attributes, "cn", "sn" );
@@ -933,7 +933,7 @@
     @Test
     public void testModifyRdnOperationalAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // create the entry
         Attributes attributes = createPerson( "cn" );
@@ -978,7 +978,7 @@
     @Test
     public void testModifyRdnObjectClassAttribute() throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         // create the entry
         Attributes attributes = createPerson( "cn" );
@@ -1023,7 +1023,7 @@
 
     private Attributes createPerson( String... rdnTypes ) throws Exception
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
         Attributes attributes = new BasicAttributes( true );
         Attribute attribute = new BasicAttribute( "objectClass" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Sun Jun 14 09:14:31 2009
@@ -29,7 +29,7 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -70,13 +70,13 @@
     private static final String NEW_DN = "uid=akarasulu,ou=NewSuperior,ou=system";
     private static final String NEW_DN2 = "uid=elecharny,ou=NewSuperior,ou=system";
     
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
 
     @Test
     public void testMoveNoRdnChange() throws Exception
     {
-        LdapContext ctx = getWiredContext( ldapService );
+        LdapContext ctx = getWiredContext( ldapServer );
         ctx.rename( DN, NEW_DN );
         
         SearchControls controls = new SearchControls();
@@ -98,7 +98,7 @@
     @Test
     public void testMoveAndRdnChange() throws Exception
     {
-        LdapContext ctx = getWiredContext( ldapService );
+        LdapContext ctx = getWiredContext( ldapServer );
         ctx.rename( DN, NEW_DN2 );
         
         SearchControls controls = new SearchControls();

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Sun Jun 14 09:14:31 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler;
@@ -149,12 +149,12 @@
 )
 public class IndexedNegationSearchIT 
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     
     public static class Factory implements LdapServerFactory
     {
-        public LdapService newInstance() throws Exception
+        public LdapServer newInstance() throws Exception
         {
             DirectoryService service = new DefaultDirectoryService();
             IntegrationUtils.doDelete( service.getWorkingDirectory() );
@@ -180,12 +180,12 @@
             // on the system and somewhere either under target directory
             // or somewhere in a temp area of the machine.
 
-            LdapService ldapService = new LdapService();
-            ldapService.setDirectoryService( service );
+            LdapServer ldapServer = new LdapServer();
+            ldapServer.setDirectoryService( service );
             int port = AvailablePortFinder.getNextAvailable( 1024 );
-            ldapService.setTcpTransport( new TcpTransport( port ) );
-            ldapService.addExtendedOperationHandler( new StartTlsHandler() );
-            ldapService.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
+            ldapServer.setTransports( new TcpTransport( port ) );
+            ldapServer.addExtendedOperationHandler( new StartTlsHandler() );
+            ldapServer.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() );
 
             // Setup SASL Mechanisms
             
@@ -205,9 +205,9 @@
             mechanismHandlerMap.put( SupportedSaslMechanisms.NTLM, ntlmMechanismHandler );
             mechanismHandlerMap.put( SupportedSaslMechanisms.GSS_SPNEGO, ntlmMechanismHandler );
 
-            ldapService.setSaslMechanismHandlers( mechanismHandlerMap );
+            ldapServer.setSaslMechanismHandlers( mechanismHandlerMap );
 
-            return ldapService;
+            return ldapServer;
         }
     }
     
@@ -281,7 +281,7 @@
     
     Set<SearchResult> getActorResults( String filter ) throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         Set<SearchResult> results = new HashSet<SearchResult>();
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -297,7 +297,7 @@
     
     Set<SearchResult> getResults( String filter ) throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         Set<SearchResult> results = new HashSet<SearchResult>();
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java Sun Jun 14 09:14:31 2009
@@ -34,7 +34,7 @@
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -108,7 +108,7 @@
 )
 public class NegationSearchIT 
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     
     /**
@@ -163,7 +163,7 @@
     
     Set<SearchResult> getResults( String filter ) throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         Set<SearchResult> results = new HashSet<SearchResult>();
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Sun Jun 14 09:14:31 2009
@@ -38,7 +38,7 @@
 
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.message.control.PagedSearchControl;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Before;
@@ -188,7 +188,7 @@
 )
 public class PagedSearchIT
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     /**
      * Create the searchControls with a paged size
@@ -302,7 +302,7 @@
     @Before
     public void reinitLdapServiceMaxSizeLimit()
     {
-        ldapService.setMaxSizeLimit( LdapService.NO_SIZE_LIMIT );
+        ldapServer.setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
     }
     
     
@@ -317,8 +317,8 @@
     @Test
     public void testPagedSearchtest1() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 3 );
+        DirContext ctx = getWiredContext( ldapServer );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -335,8 +335,8 @@
     @Test
     public void testPagedSearchtest2() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        DirContext ctx = getWiredContext( ldapServer );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -353,9 +353,9 @@
     @Test
     public void testPagedSearchTest3() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -372,7 +372,7 @@
     @Test
     public void testPagedSearchTest4() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 3, 5 );
         
         doLoop( ctx, controls, 5, 1, 3, true );
@@ -390,9 +390,9 @@
     @Test
     public void testPagedSearchtest5() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 3 );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
 
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -409,7 +409,7 @@
     @Test
     public void testPagedSearchTest6() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 9, 5 );
         
         doLoop( ctx, controls, 5, 2, 9, true );
@@ -427,9 +427,9 @@
     @Test
     public void testPagedSearchtest7() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -446,7 +446,7 @@
     @Test
     public void testPagedSearchTest8() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 5, 5 );
         
         doLoop( ctx, controls, 5, 1, 5, true );
@@ -464,8 +464,8 @@
     @Test
     public void testPagedSearchTest9() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 4, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -483,8 +483,8 @@
     @Test
     public void testPagedSearchtest10() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 5, 3 );
         
         doLoop( ctx, controls, 3, 2, 5, true );
@@ -502,8 +502,8 @@
     @Test
     public void testPagedSearchtest11() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 3, 4 );
         
         doLoop( ctx, controls, 4, 1, 3, true );
@@ -521,8 +521,8 @@
     @Test
     public void testPagedSearchtest12() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 4, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -540,8 +540,8 @@
     @Test
     public void testPagedSearchtest13() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 5, 3 );
         
         doLoop( ctx, controls, 3, 2, 5, true );
@@ -559,8 +559,8 @@
     @Test
     public void testPagedSearchtest14() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 3, 5 );
         
         doLoop( ctx, controls, 5, 1, 3, true );
@@ -578,8 +578,8 @@
     @Test
     public void testPagedSearchtest15() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 5, 4 );
         
         doLoop( ctx, controls, 4, 2, 5, true );
@@ -597,8 +597,8 @@
     @Test
     public void testPagedSearchtest16() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 4, 5 );
         
         doLoop( ctx, controls, 5, 1, 4, true );
@@ -616,8 +616,8 @@
     @Test
     public void testPagedSearchtest17() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls controls = createSearchControls( ctx, 5, 5 );
         
         doLoop( ctx, controls, 5, 1, 5, true );
@@ -635,8 +635,8 @@
     @Test
     public void testPagedSearchtest18() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 3 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 4, 10, false );
     }
@@ -653,8 +653,8 @@
     @Test
     public void testPagedSearchtest19() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 2, 10, false );
     }
@@ -671,9 +671,9 @@
     @Test
     public void testPagedSearchTest20() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 1, 3, true );
     }
@@ -690,7 +690,7 @@
     @Test
     public void testPagedSearchTest21() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 3, 5 );
         
         doLoop( ctx, controls, 5, 1, 3, true );
@@ -708,9 +708,9 @@
     @Test
     public void testPagedSearchtest22() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 3 );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
         
         doLoop( ctx, controls, 3, 2, 5, true );
     }
@@ -727,7 +727,7 @@
     @Test
     public void testPagedSearchTest23() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 9, 5 );
         
         
@@ -746,9 +746,9 @@
     @Test
     public void testPagedSearchtest24() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 5 );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 5 );
         
         doLoop( ctx, controls, 5, 1, 5, true );
     }
@@ -765,7 +765,7 @@
     @Test
     public void testPagedSearchTest25() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 5, 5 );
         
         
@@ -784,8 +784,8 @@
     @Test
     public void testPagedSearchTest26() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 4, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -803,8 +803,8 @@
     @Test
     public void testPagedSearchtest27() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 5, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -822,8 +822,8 @@
     @Test
     public void testPagedSearchtest28() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 3, 4 );
         
         doLoop( ctx, controls, 4, 1, 3, true );
@@ -841,8 +841,8 @@
     @Test
     public void testPagedSearchtest29() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 4, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -860,8 +860,8 @@
     @Test
     public void testPagedSearchtest30() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 5, 3 );
         
         doLoop( ctx, controls, 3, 2, 4, true );
@@ -879,8 +879,8 @@
     @Test
     public void testPagedSearchtest31() throws Exception
     {
-        ldapService.setMaxSizeLimit( 4 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 4 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 3, 5 );
         
         doLoop( ctx, controls, 3, 1, 3, true );
@@ -898,8 +898,8 @@
     @Test
     public void testPagedSearchtest32() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 5, 4 );
         
         doLoop( ctx, controls, 3, 1, 3, true );
@@ -917,8 +917,8 @@
     @Test
     public void testPagedSearchtest33() throws Exception
     {
-        ldapService.setMaxSizeLimit( 3 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 3 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 4, 5 );
         
         doLoop( ctx, controls, 3, 1, 3, true );
@@ -936,8 +936,8 @@
     @Test
     public void testPagedSearchtest34() throws Exception
     {
-        ldapService.setMaxSizeLimit( 5 );
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
+        ldapServer.setMaxSizeLimit( 5 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
         SearchControls controls = createSearchControls( ctx, 5, 5 );
         
         doLoop( ctx, controls, 5, 1, 5, true );
@@ -955,8 +955,8 @@
     @Test
     public void testPagedSearchWithNegativePL() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, -2 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, -2 );
         
         doLoop( ctx, controls, -2, 1, 10, false );
     }
@@ -968,8 +968,8 @@
     @Test 
     public void testPagedSearchWrongCookie() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 3 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 3 );
 
         // Loop over all the elements
         int loop = 0;
@@ -1029,8 +1029,8 @@
     @Test 
     public void testPagedSearchModifyingPagedLimit() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService, "cn=user,ou=system", "secret" );
-        SearchControls controls = createSearchControls( ctx, LdapService.NO_SIZE_LIMIT, 4 );
+        DirContext ctx = getWiredContext( ldapServer, "cn=user,ou=system", "secret" );
+        SearchControls controls = createSearchControls( ctx, LdapServer.NO_SIZE_LIMIT, 4 );
 
         // Loop over all the elements
         int loop = 0;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Sun Jun 14 09:14:31 2009
@@ -48,7 +48,7 @@
 import org.apache.directory.server.integ.SiRunner;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlCodec;
 import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeControlDecoder;
@@ -91,7 +91,7 @@
     private static final String PERSON_DESCRIPTION = "an American singer-songwriter";
     private static final String RDN = "cn=Tori Amos";
 
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
 
     /**
@@ -126,8 +126,8 @@
     public void setUpListener( boolean returnECs, PersistentSearchControl control, boolean ignoreEmptyRegistryCheck ) 
         throws Exception
     {
-        ctx = ( EventDirContext ) getWiredContext( ldapService).lookup( BASE );
-        eventService = ldapService.getDirectoryService().getEventService();
+        ctx = ( EventDirContext ) getWiredContext( ldapServer).lookup( BASE );
+        eventService = ldapServer.getDirectoryService().getEventService();
         List<RegistrationEntry> registrationEntryList = eventService.getRegistrationEntries();
         
         if ( ! ignoreEmptyRegistryCheck )
@@ -152,8 +152,8 @@
     
     public void setUpListener() throws Exception
     {
-        ctx = ( EventDirContext ) getWiredContext( ldapService).lookup( BASE );
-        eventService = ldapService.getDirectoryService().getEventService();
+        ctx = ( EventDirContext ) getWiredContext( ldapServer).lookup( BASE );
+        eventService = ldapServer.getDirectoryService().getEventService();
         List<RegistrationEntry> registrationEntryList = eventService.getRegistrationEntries();
         assertTrue( registrationEntryList.isEmpty() );
         
@@ -582,7 +582,7 @@
 
             try
             {
-                ctx = ( LdapContext ) getWiredContext( ldapService).lookup( BASE );
+                ctx = ( LdapContext ) getWiredContext( ldapServer).lookup( BASE );
                 ctx.setRequestControls( ctxCtls );
                 isReady = true;
                 LOG.debug( "PSearchListener is ready and about to issue persistent search request." );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java Sun Jun 14 09:14:31 2009
@@ -41,7 +41,7 @@
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContextThrowOnRefferal;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.junit.Before;
@@ -118,7 +118,7 @@
 )
 public class ReferralSearchIT
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     
     @Before
@@ -130,21 +130,21 @@
         "objectClass: referral\n" +
         "objectClass: extensibleObject\n" +
         "c: europ\n" +
-        "ref: ldap://localhost:" + ldapService.getPort() + "/c=france,ou=system\n\n" +
+        "ref: ldap://localhost:" + ldapServer.getPort() + "/c=france,ou=system\n\n" +
 
         "dn: c=america,ou=Countries,ou=system\n" +
         "objectClass: top\n" +
         "objectClass: referral\n" +
         "objectClass: extensibleObject\n" +
         "c: america\n" +
-        "ref: ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system\n\n";
+        "ref: ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system\n\n";
 
         LdifReader reader = new LdifReader( new StringReader( ldif ) );
         while ( reader.hasNext() )
         {
             LdifEntry entry = reader.next();
-            ldapService.getDirectoryService().getAdminSession().add( 
-                new DefaultServerEntry( ldapService.getDirectoryService().getRegistries(), entry.getEntry() ) ); 
+            ldapServer.getDirectoryService().getAdminSession().add( 
+                new DefaultServerEntry( ldapServer.getDirectoryService().getRegistries(), entry.getEntry() ) ); 
         }
     }
     
@@ -152,7 +152,7 @@
     @Test
     public void testSearchBaseIsReferral() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         
@@ -176,7 +176,7 @@
     @Test
     public void testSearchBaseParentIsReferral() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
 
@@ -199,7 +199,7 @@
     @Test
     public void testSearchBaseAncestorIsReferral() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
 
@@ -224,7 +224,7 @@
     @Test
     public void testSearchContinuations() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -302,7 +302,7 @@
     @Test
     public void testSearchWithReferralThrow() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         try
         {
@@ -314,7 +314,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??sub", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??sub", referral );
         }
     }
 
@@ -329,7 +329,7 @@
     @Test
     public void testSearchBaseWithReferralThrow() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -342,7 +342,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
     }
 
@@ -358,7 +358,7 @@
     @Test
     public void testSearchBaseWithReferralThrowAfterRename() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -371,7 +371,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -392,7 +392,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
     }
@@ -409,7 +409,7 @@
     @Test
     public void testSearchBaseWithReferralThrowAfterMove() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -422,7 +422,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -443,7 +443,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
     }
@@ -460,7 +460,7 @@
     @Test
     public void testSearchBaseWithReferralThrowAfterMoveAndRename() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -473,7 +473,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
         Control manageDsaItControl = new ManageReferralControl();
@@ -494,7 +494,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??base", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??base", referral );
         }
         
     }
@@ -510,7 +510,7 @@
     @Test
     public void testSearchOneLevelWithReferralThrow() throws Exception
     {
-        DirContext ctx = getWiredContextThrowOnRefferal( ldapService );
+        DirContext ctx = getWiredContextThrowOnRefferal( ldapServer );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -523,7 +523,7 @@
         catch ( ReferralException re )
         {
             String referral = (String)re.getReferralInfo();
-            assertEquals( "ldap://localhost:" + ldapService.getPort() + "/c=usa,ou=system??one", referral );
+            assertEquals( "ldap://localhost:" + ldapServer.getPort() + "/c=usa,ou=system??one", referral );
         }
     }
 }
\ No newline at end of file

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SchemaSearchIT.java Sun Jun 14 09:14:31 2009
@@ -31,7 +31,7 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -167,7 +167,7 @@
     private static final String FILTER = "(objectclass=subschema)";
 
     
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
 
     protected void checkForAttributes( Attributes attrs, String[] attrNames )
@@ -188,7 +188,7 @@
     @Test
     public void testRequestOperationalAttributes() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls ctls = new SearchControls();
 
         String[] attrNames =
@@ -220,7 +220,7 @@
     @Test
     public void testRequestAllOperationalAttributes() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -252,7 +252,7 @@
     @Test
     public void testSearchingNewSchemaElements() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
         
         // create an entry with the schema objectClass personActiveDirectory
         Attributes person = new BasicAttributes( "objectClass", "top", true );
@@ -297,7 +297,7 @@
     @Test
     public void testRequestWithoutManageDsaITControl() throws Exception
     {
-        DirContext ctx = getWiredContext( ldapService );
+        DirContext ctx = getWiredContext( ldapServer );
 
         // this removes the ManageDsaIT control from the search request
         ctx.addToEnvironment( DirContext.REFERRAL, "throw" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=784530&r1=784529&r2=784530&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Sun Jun 14 09:14:31 2009
@@ -51,7 +51,7 @@
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.subtree.SubentryInterceptor;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.message.control.SubentriesControl;
 import org.junit.Test;
@@ -168,7 +168,7 @@
 {
     private static final String BASE = "ou=system";
     
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
     
     private static final String RDN = "cn=Tori Amos";
     private static final String RDN2 = "cn=Rolling-Stones";
@@ -260,7 +260,7 @@
     @Test
     public void testSearchByBinaryAttribute() throws Exception 
     {
-        DirContext ctx = ( DirContext ) getWiredContext( ldapService ).lookup( BASE );
+        DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         byte[] certData = new byte[] { 0x34, 0x56, 0x4e, 0x5f };
         
         // Search for kate by cn first
@@ -290,7 +290,7 @@
     @Test
     public void testSearch() throws Exception
     {
-        LdapContext ctx = getWiredContext( ldapService );
+        LdapContext ctx = getWiredContext( ldapServer );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         controls.setTimeLimit( 10 );
@@ -342,7 +342,7 @@
      */
     private Set<String> search( String filter ) throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         NamingEnumeration<SearchResult> ii = ctx.search( "", filter, controls );
@@ -431,7 +431,7 @@
     @Test
     public void testSearchWithBackslashEscapedBase() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // create additional entry
         Attributes attributes = this.getPersonAttributes( "Ferry", "Bryan Ferry" );
@@ -473,7 +473,7 @@
     @Test
     public void testSearchValue() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // Setting up search controls for compare op
         SearchControls ctls = new SearchControls();
@@ -612,7 +612,7 @@
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         controls.setReturningAttributes( new String[] { "objectClasses" } );
 
-        LdapContext ctx = getWiredContext( ldapService );
+        LdapContext ctx = getWiredContext( ldapServer );
 
         NamingEnumeration<SearchResult> results = ctx.search( "cn=schema", "objectClass=subschema", controls );
         assertTrue( results.hasMore() );
@@ -645,7 +645,7 @@
      */
     private void createAccessControlSubentry( String cn, String subtree, String aciItem ) throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         DirContext adminCtx = ctx;
 
@@ -678,7 +678,7 @@
     @Test
     public void testAddWithObjectclasses() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls ctls = new SearchControls();
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -714,7 +714,7 @@
     @Test
     public void testAddWithMissingObjectclasses() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         String rdn = "cn=Kate Bush";
         SearchControls ctls = new SearchControls();
@@ -747,7 +747,7 @@
     @Test
     public void testSubentryControl() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // create a real access control subentry
         createAccessControlSubentry( 
@@ -809,7 +809,7 @@
     @Test
     public void testMultiValuedRdnContent() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
         String rdn = "cn=Kate Bush+sn=Bush";
@@ -843,7 +843,7 @@
     @Test
     public void testMultiValuedRdnName() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
         String rdn = "cn=Kate Bush+sn=Bush";
@@ -874,7 +874,7 @@
     @Test
     public void testSearchJpeg() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -907,7 +907,7 @@
     @Test
     public void testSearchOID() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -934,7 +934,7 @@
     @Test
     public void testSearchAttrCN() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -962,7 +962,7 @@
     @Test
     public void testSearchAttrName() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -993,7 +993,7 @@
     @Test
     public void testSearchAttrCommonName() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1027,7 +1027,7 @@
     @Test
     public void testSearchAttrOID() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1060,7 +1060,7 @@
     @Test
     public void testSearchAttrC_L() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         // create administrative area
         Attributes aaAttrs = new BasicAttributes( true );
@@ -1116,7 +1116,7 @@
     @Test
     public void testSearchUsersAttrs() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1149,7 +1149,7 @@
     @Test
     public void testSearchOperationalAttrs() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1184,7 +1184,7 @@
     @Test
     public void testSearchAllAttrs() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1219,7 +1219,7 @@
     @Test
     public void testSearchBadDN() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         
@@ -1237,7 +1237,7 @@
     @Test
     public void testSearchInvalidDN() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1260,7 +1260,7 @@
     @Test
     public void testSearchOperationalAttributes() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1293,7 +1293,7 @@
     @Test
     public void testSearchUserAttributes() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1326,7 +1326,7 @@
     @Test
     public void testSearchUserAttributes_Space() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1344,7 +1344,7 @@
     @Test
     public void testSearchUserAttributes_EmptyAttrs() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1362,7 +1362,7 @@
     @Test
     public void testSearchUserAttributes_NullAttrs() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1379,7 +1379,7 @@
     @Test
     public void testSearchOperationalAndUserAttributes() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
  
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -1438,7 +1438,7 @@
     @Test
     public void testSubstringSearchWithEscapedCharsInFilter() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         Attributes attrs = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         attrs.get( "objectClass" ).add( "organizationalPerson" );
@@ -1481,7 +1481,7 @@
     @Test
     public void testMissingAnyInSubstring_DIRSERVER_1180() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         Attributes attrs = new BasicAttributes( "objectClass", "inetOrgPerson", true );
         attrs.get( "objectClass" ).add( "organizationalPerson" );
         attrs.get( "objectClass" ).add( "person" );
@@ -1506,7 +1506,7 @@
     @Test
     public void testSubstringSearchWithEscapedAsterisksInFilter_DIRSERVER_1181() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         Attributes vicious = new BasicAttributes( true );
         Attribute ocls = new BasicAttribute( "objectClass" );
@@ -1542,7 +1542,7 @@
     @Test
     public void testUnicodeFilter_DIRSERVER_1347() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
 
         Attributes groupOfNames = new BasicAttributes( true );
         Attribute groupOfNamesOC = new BasicAttribute( "objectClass" );
@@ -1603,7 +1603,7 @@
     @Test
     public void testSearchUserAttributes_1_1() throws Exception
     {
-        LdapContext ctx = ( LdapContext ) getWiredContext( ldapService ).lookup( BASE );
+        LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( BASE );
         SearchControls ctls = new SearchControls();
 
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );



Mime
View raw message