directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1071728 [2/7] - in /directory: apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/m1/core-api/src/ma...
Date Thu, 17 Feb 2011 17:50:56 GMT
Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Thu Feb 17 17:50:50 2011
@@ -72,8 +72,8 @@ public class DefaultChangeLogIT extends 
     @Test
     public void testManyTagsPersistenceAcrossRestarts() throws Exception, InterruptedException
     {
-        LdapConnection sysRoot = getAdminConnection( service );
-        long revision = service.getChangeLog().getCurrentRevision();
+        LdapConnection sysRoot = getAdminConnection( getService() );
+        long revision = getService().getChangeLog().getCurrentRevision();
 
         // add new test entry
         Entry entry = new DefaultEntry( new Dn( "ou=test0,ou=system" ) );
@@ -81,11 +81,11 @@ public class DefaultChangeLogIT extends 
         entry.add( SchemaConstants.OU_AT, "test0" );
         sysRoot.add( entry );
 
-        assertEquals( revision + 1, service.getChangeLog().getCurrentRevision() );
+        assertEquals( revision + 1, getService().getChangeLog().getCurrentRevision() );
 
-        Tag t0 = service.getChangeLog().tag();
-        assertEquals( t0, service.getChangeLog().getLatest() );
-        assertEquals( revision + 1, service.getChangeLog().getCurrentRevision() );
+        Tag t0 = getService().getChangeLog().tag();
+        assertEquals( t0, getService().getChangeLog().getLatest() );
+        assertEquals( revision + 1, getService().getChangeLog().getCurrentRevision() );
         assertEquals( revision + 1, t0.getRevision() );
 
         // add another test entry
@@ -93,19 +93,19 @@ public class DefaultChangeLogIT extends 
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test1" );
         sysRoot.add( entry );
-        assertEquals( revision + 2, service.getChangeLog().getCurrentRevision() );
+        assertEquals( revision + 2, getService().getChangeLog().getCurrentRevision() );
 
-        Tag t1 = service.getChangeLog().tag();
-        assertEquals( t1, service.getChangeLog().getLatest() );
-        assertEquals( revision + 2, service.getChangeLog().getCurrentRevision() );
+        Tag t1 = getService().getChangeLog().tag();
+        assertEquals( t1, getService().getChangeLog().getLatest() );
+        assertEquals( revision + 2, getService().getChangeLog().getCurrentRevision() );
         assertEquals( revision + 2, t1.getRevision() );
 
-        service.shutdown();
-        service.startup();
+        getService().shutdown();
+        getService().startup();
 
-        sysRoot = getAdminConnection( service );
-        assertEquals( revision + 2, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t1, service.getChangeLog().getLatest() );
+        sysRoot = getAdminConnection( getService() );
+        assertEquals( revision + 2, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t1, getService().getChangeLog().getLatest() );
         assertEquals( revision + 2, t1.getRevision() );
 
         // add third test entry
@@ -113,85 +113,85 @@ public class DefaultChangeLogIT extends 
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test2" );
         sysRoot.add( entry );
-        assertEquals( revision + 3, service.getChangeLog().getCurrentRevision() );
+        assertEquals( revision + 3, getService().getChangeLog().getCurrentRevision() );
 
-        service.revert();
+        getService().revert();
 
         assertPresent( sysRoot, "ou=test0,ou=system" ); // test present
         assertPresent( sysRoot, "ou=test1,ou=system" ); // test present
 
         assertNotPresent( sysRoot, "ou=test2,ou=system" );
-        assertEquals( revision + 4, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t1, service.getChangeLog().getLatest() );
+        assertEquals( revision + 4, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t1, getService().getChangeLog().getLatest() );
 
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
         assertPresent( sysRoot, "ou=test0,ou=system" ); // test present
         assertNotPresent( sysRoot, "ou=test1,ou=system" );
         assertNotPresent( sysRoot, "ou=test2,ou=system" );
-        assertEquals( revision + 7, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t1, service.getChangeLog().getLatest() );
+        assertEquals( revision + 7, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t1, getService().getChangeLog().getLatest() );
 
         // no sync this time but should happen automatically
-        service.shutdown();
-        service.startup();
+        getService().shutdown();
+        getService().startup();
 
-        sysRoot = getAdminConnection( service );
-        assertEquals( revision + 7, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t1, service.getChangeLog().getLatest() );
+        sysRoot = getAdminConnection( getService() );
+        assertEquals( revision + 7, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t1, getService().getChangeLog().getLatest() );
         assertEquals( revision + 2, t1.getRevision() );
 
-        service.revert( revision );
+        getService().revert( revision );
         assertNotPresent( sysRoot, "ou=test0,ou=system" );
         assertNotPresent( sysRoot, "ou=test1,ou=system" );
         assertNotPresent( sysRoot, "ou=test2,ou=system" );
-        assertEquals( revision + 14, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t1, service.getChangeLog().getLatest() );
+        assertEquals( revision + 14, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t1, getService().getChangeLog().getLatest() );
     }
 
 
     @Test
     public void testTagPersistenceAcrossRestarts() throws Exception, InterruptedException
     {
-        LdapConnection sysRoot = getAdminConnection( service );
-        long revision = service.getChangeLog().getCurrentRevision();
+        LdapConnection sysRoot = getAdminConnection( getService() );
+        long revision = getService().getChangeLog().getCurrentRevision();
 
-        Tag t0 = service.getChangeLog().tag();
-        assertEquals( t0, service.getChangeLog().getLatest() );
-        assertEquals( revision, service.getChangeLog().getCurrentRevision() );
+        Tag t0 = getService().getChangeLog().tag();
+        assertEquals( t0, getService().getChangeLog().getLatest() );
+        assertEquals( revision, getService().getChangeLog().getCurrentRevision() );
 
         // add new test entry
         Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
-        assertEquals( revision + 1, service.getChangeLog().getCurrentRevision() );
+        assertEquals( revision + 1, getService().getChangeLog().getCurrentRevision() );
 
-        service.shutdown();
-        service.startup();
+        getService().shutdown();
+        getService().startup();
 
-        sysRoot = getAdminConnection( service );
-        assertEquals( revision + 1, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t0, service.getChangeLog().getLatest() );
+        sysRoot = getAdminConnection( getService() );
+        assertEquals( revision + 1, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t0, getService().getChangeLog().getLatest() );
 
-        service.revert();
+        getService().revert();
         assertNotPresent( sysRoot, "ou=test" );
-        assertEquals( revision + 2, service.getChangeLog().getCurrentRevision() );
-        assertEquals( t0, service.getChangeLog().getLatest() );
+        assertEquals( revision + 2, getService().getChangeLog().getCurrentRevision() );
+        assertEquals( t0, getService().getChangeLog().getLatest() );
     }
 
 
     @Test
     public void testRevertAddOperations() throws Exception
     {
-        LdapConnection sysRoot = getAdminConnection( service );
-        Tag t0 = service.getChangeLog().tag();
+        LdapConnection sysRoot = getAdminConnection( getService() );
+        Tag t0 = getService().getChangeLog().tag();
         Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
 
         assertPresent( sysRoot, "ou=test,ou=system" );
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
 
         assertNotPresent( sysRoot, "ou=test,ou=system" );
     }
@@ -200,8 +200,8 @@ public class DefaultChangeLogIT extends 
     @Test
     public void testRevertAddAndDeleteOperations() throws Exception
     {
-        LdapConnection sysRoot = getAdminConnection( service );
-        Tag t0 = service.getChangeLog().tag();
+        LdapConnection sysRoot = getAdminConnection( getService() );
+        Tag t0 = getService().getChangeLog().tag();
 
         // add new test entry
         Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
@@ -217,7 +217,7 @@ public class DefaultChangeLogIT extends 
         assertNotPresent( sysRoot, "ou=test,ou=system" );
 
         // now revert back to begining the added entry is still gone
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
         assertNotPresent( sysRoot, "ou=test" );
     }
 
@@ -225,14 +225,14 @@ public class DefaultChangeLogIT extends 
     @Test
     public void testRevertDeleteOperations() throws Exception
     {
-        LdapConnection sysRoot = getAdminConnection( service );
+        LdapConnection sysRoot = getAdminConnection( getService() );
         Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
 
         // tag after the addition before deletion
-        Tag t0 = service.getChangeLog().tag();
+        Tag t0 = getService().getChangeLog().tag();
         assertPresent( sysRoot, "ou=test,ou=system" );
 
         // delete the test entry and test that it is gone
@@ -240,7 +240,7 @@ public class DefaultChangeLogIT extends 
         assertNotPresent( sysRoot, "ou=test,ou=system" );
 
         // now revert and assert that the added entry re-appears
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
         assertPresent( sysRoot, "ou=test,ou=system" );
     }
 
@@ -248,14 +248,14 @@ public class DefaultChangeLogIT extends 
     @Test
     public void testRevertRenameOperations() throws Exception
     {
-        LdapConnection sysRoot = getAdminConnection( service );
+        LdapConnection sysRoot = getAdminConnection( getService() );
         Entry entry = new DefaultEntry( new Dn( "ou=oldname,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "oldname" );
         sysRoot.add( entry );
 
         // tag after the addition before rename
-        Tag t0 = service.getChangeLog().tag();
+        Tag t0 = getService().getChangeLog().tag();
         assertPresent( sysRoot, "ou=oldname,ou=system" );
 
         // rename the test entry and test that the rename occurred
@@ -264,7 +264,7 @@ public class DefaultChangeLogIT extends 
         assertPresent( sysRoot, "ou=newname,ou=system" );
 
         // now revert and assert that the rename was reversed
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
         assertPresent( sysRoot, "ou=oldname,ou=system" );
         assertNotPresent( sysRoot, "ou=newname,ou=system" );
 
@@ -274,7 +274,7 @@ public class DefaultChangeLogIT extends 
     @Test
     public void testRevertModifyOperations() throws Exception
     {
-        LdapConnection sysRoot = getAdminConnection( service );
+        LdapConnection sysRoot = getAdminConnection( getService() );
         Entry entry = new DefaultEntry( new Dn( "ou=test5,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test5" );
@@ -285,7 +285,7 @@ public class DefaultChangeLogIT extends 
         // -------------------------------------------------------------------
 
         // tag after the addition before modify ADD
-        Tag t0 = service.getChangeLog().tag();
+        Tag t0 = getService().getChangeLog().tag();
         assertPresent( sysRoot, "ou=test5,ou=system" );
 
         // modify the test entry to add description and test new attr appears
@@ -301,7 +301,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( "a desc value", description.getString() );
 
         // now revert and assert that the added entry re-appears
-        service.revert( t0.getRevision() );
+        getService().revert( t0.getRevision() );
         resusitated = sysRoot.lookup( "ou=test5,ou=system" );
         assertNotNull( resusitated );
         assertNull( resusitated.get( "description" ) );
@@ -322,7 +322,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( description.getString(), "old value" );
 
         // now tag then replace the value to "new value" and confirm
-        Tag t1 = service.getChangeLog().tag();
+        Tag t1 = getService().getChangeLog().tag();
         modReq = new ModifyRequestImpl();
         modReq.setName( resusitated.getDn() );
         modReq.replace( "description", "new value" );
@@ -335,7 +335,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( description.getString(), "new value" );
 
         // now revert and assert the old value is now reverted
-        service.revert( t1.getRevision() );
+        getService().revert( t1.getRevision() );
         resusitated = sysRoot.lookup( "ou=test5,ou=system" );
         assertNotNull( resusitated );
         description = resusitated.get( "description" );
@@ -346,7 +346,7 @@ public class DefaultChangeLogIT extends 
         // Modify REMOVE Test
         // -------------------------------------------------------------------
 
-        Tag t2 = service.getChangeLog().tag();
+        Tag t2 = getService().getChangeLog().tag();
         modReq = new ModifyRequestImpl();
         modReq.setName( resusitated.getDn() );
         modReq.remove( "description", "old value" );
@@ -358,7 +358,7 @@ public class DefaultChangeLogIT extends 
         assertNull( description );
 
         // now revert and assert the old value is now reverted
-        service.revert( t2.getRevision() );
+        getService().revert( t2.getRevision() );
         resusitated = sysRoot.lookup( "ou=test5,ou=system" );
         assertNotNull( resusitated );
         description = resusitated.get( "description" );
@@ -383,7 +383,7 @@ public class DefaultChangeLogIT extends 
         modReq.add( "seeAlso", "ou=added" );
         modReq.replace( "userPassword", "a replaced value" );
 
-        Tag t3 = service.getChangeLog().tag();
+        Tag t3 = getService().getChangeLog().tag();
 
         // now make the modification and check that description is gone,
         // seeAlso is added, and that the userPassword has been replaced
@@ -398,7 +398,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( seeAlso.getString(), "ou=added" );
 
         // now we revert and make sure the old values are as they were
-        service.revert( t3.getRevision() );
+        getService().revert( t3.getRevision() );
         resusitated = sysRoot.lookup( "ou=test5,ou=system" );
         assertNotNull( resusitated );
         description = resusitated.get( "description" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Thu Feb 17 17:50:50 2011
@@ -184,7 +184,7 @@ public class CollectiveAttributeServiceI
     @Before
     public void init() throws Exception
     {
-        connection = IntegrationUtils.getAdminConnection( service );
+        connection = IntegrationUtils.getAdminConnection( getService() );
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Thu Feb 17 17:50:50 2011
@@ -56,29 +56,29 @@ public class PartitionConfigurationIT ex
     public void testAddAndRemove() throws Exception
     {
         PartitionFactory partitionFactory = DefaultDirectoryServiceFactory.DEFAULT.getPartitionFactory();
-        Partition partition = partitionFactory.createPartition( "removable", "ou=removable", 100, service
+        Partition partition = partitionFactory.createPartition( "removable", "ou=removable", 100, getService()
             .getInstanceLayout().getPartitionsDirectory() );
 
         // Test AddContextPartition
-        service.addPartition( partition );
+        getService().addPartition( partition );
 
-        Dn suffixDn = new Dn( service.getSchemaManager(), "ou=removable" );
+        Dn suffixDn = new Dn( getService().getSchemaManager(), "ou=removable" );
 
-        Entry ctxEntry = LdifUtils.createEntry( service.getSchemaManager(), suffixDn,
+        Entry ctxEntry = LdifUtils.createEntry( getService().getSchemaManager(), suffixDn,
             "objectClass: top",
             "objectClass: organizationalUnit",
             "ou: removable",
             "entryCSN", new CsnFactory( 1 ).newInstance().toString(),
             "entryUUID", UUID.randomUUID().toString() );
 
-        partition.add( new AddOperationContext( service.getAdminSession(), ctxEntry ) );
+        partition.add( new AddOperationContext( getService().getAdminSession(), ctxEntry ) );
 
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         assertNotNull( connection.lookup( "ou=removable" ) );
 
         // Test removeContextPartition
-        service.removePartition( partition );
+        getService().removePartition( partition );
 
         assertNull( connection.lookup( "ou=removable" ) );
     }

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Thu Feb 17 17:50:50 2011
@@ -63,7 +63,7 @@ public class EventServiceIT extends Abst
     public void testRemoveNamingListener() throws Exception
     {
         TestListener listener = new TestListener();
-        EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
+        EventDirContext ctx = ( EventDirContext ) getSystemContext( getService() ).lookup( "" );
         ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
 
         Attributes testEntry = LdifUtils.createAttributes(
@@ -115,7 +115,7 @@ public class EventServiceIT extends Abst
     public void testContextClose() throws Exception
     {
         TestListener listener = new TestListener();
-        EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
+        EventDirContext ctx = ( EventDirContext ) getSystemContext( getService() ).lookup( "" );
         ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
 
         Attributes testEntry = LdifUtils.createAttributes( 
@@ -134,7 +134,7 @@ public class EventServiceIT extends Abst
         assertEquals( ctx, rec.event.getSource() );
 
         ctx.close();
-        ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
+        ctx = ( EventDirContext ) getSystemContext( getService() ).lookup( "" );
         ctx.destroySubcontext( "ou=testentry" );
 
         //  Wait 1 second, as the process is asynchronous

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Thu Feb 17 17:50:50 2011
@@ -39,11 +39,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
-import org.apache.directory.shared.ldap.model.message.*;
+import org.apache.directory.shared.ldap.model.message.AddResponse;
+import org.apache.directory.shared.ldap.model.message.DeleteResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
+import org.apache.directory.shared.ldap.model.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 import org.apache.directory.shared.ldap.model.message.Response;
+import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.junit.After;
@@ -77,7 +80,7 @@ public class ExceptionServiceIT extends 
         entry.add( SchemaConstants.CN_AT, value );
         entry.add( SchemaConstants.SN_AT, value );
 
-        AddResponse resp = getAdminConnection( service ).add( entry );
+        AddResponse resp = getAdminConnection( getService() ).add( entry );
 
         return resp;
     }
@@ -102,7 +105,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailSearchNoSuchObject() throws Exception
     {
-        Cursor<Response> cursor = getAdminConnection( service ).search( "ou=blah", "(objectClass=*)",
+        Cursor<Response> cursor = getAdminConnection( getService() ).search( "ou=blah", "(objectClass=*)",
             SearchScope.ONELEVEL, "*" );
         assertFalse( cursor.next() );
     }
@@ -117,7 +120,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testSearchControl() throws Exception
     {
-        Cursor<Response> cursor = getAdminConnection( service ).search( "ou=users,ou=system", "(objectClass=*)",
+        Cursor<Response> cursor = getAdminConnection( getService() ).search( "ou=users,ou=system", "(objectClass=*)",
             SearchScope.ONELEVEL, "*" );
 
         assertFalse( cursor.next() );
@@ -136,7 +139,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailMoveEntryAlreadyExists() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         Entry entry = new DefaultEntry( new Dn( "ou=users,ou=groups,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "OrganizationalUnit" );
@@ -165,7 +168,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailMoveNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         ModifyDnResponse resp = connection.rename( "ou=blah,ou=groups,ou=system", "ou=blah1" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
@@ -184,7 +187,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testMoveControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         connection.move( "ou=users,ou=system", "ou=groups,ou=system" );
         Entry entry = connection.lookup( "ou=users,ou=groups,ou=system" );
@@ -207,7 +210,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailModifyRdnEntryAlreadyExists() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         ModifyDnResponse resp = connection.rename( "ou=users,ou=system", "ou=groups" );
         assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, resp.getLdapResult().getResultCode() );
@@ -222,7 +225,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailModifyRdnNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         ModifyDnResponse resp = connection.rename( "ou=blah,ou=system", "ou=asdf" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, resp.getLdapResult().getResultCode() );
@@ -238,7 +241,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testModifyRdnControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         connection.rename( "ou=users,ou=system", "ou=asdf" );
         assertNotNull( connection.lookup( "ou=asdf,ou=system" ) );
@@ -259,7 +262,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailModifyNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( new Dn( "ou=blah,ou=system" ) );
@@ -279,7 +282,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testModifyControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( new Dn( "ou=users,ou=system" ) );
@@ -305,7 +308,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailLookupNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         assertNull( connection.lookup( "ou=blah,ou=system" ) );
     }
@@ -320,7 +323,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testLookupControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         Entry entry = connection.lookup( "ou=users,ou=system" );
         assertNotNull( entry );
@@ -340,7 +343,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailListNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         try
         {
@@ -363,7 +366,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testListControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         NamingEnumeration<?> list = connection.list( "ou=users" );
 
@@ -391,7 +394,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailAddOnAlias() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         Entry entry = new DefaultEntry( new Dn( "cn=toanother,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "alias", SchemaConstants.EXTENSIBLE_OBJECT_OC );
@@ -431,7 +434,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testAddControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         AddResponse resp = createSubContext( "ou", "blah" );
         resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
@@ -452,7 +455,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailDeleteNotAllowedOnNonLeaf() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         AddResponse resp = createSubContext( "ou", "blah" );
         resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
@@ -471,7 +474,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testFailDeleteNoSuchObject() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         DeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
         assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, delResp.getLdapResult().getResultCode() );
@@ -486,7 +489,7 @@ public class ExceptionServiceIT extends 
     @Test
     public void testDeleteControl() throws Exception
     {
-        LdapConnection connection = getAdminConnection( service );
+        LdapConnection connection = getAdminConnection( getService() );
 
         AddResponse resp = createSubContext( "ou", "blah" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java Thu Feb 17 17:50:50 2011
@@ -104,7 +104,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddAttributesNotInObjectClasses() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = LdifUtils.createAttributes(
                 "ObjectClass: top",
@@ -134,7 +134,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddAttributesBadSyntax() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = LdifUtils.createAttributes( 
             "ObjectClass: top",
@@ -170,7 +170,7 @@ public class AddIT extends AbstractLdapT
             "cn: John\\+Doe",
             "sn: \\+Name\\+" );
         
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         DirContext dc = sysRoot.createSubcontext( "cn=John\\+Doe", entry );
         
         ServerLdapContext sc = ( ServerLdapContext ) dc;

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Thu Feb 17 17:50:50 2011
@@ -78,7 +78,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testMultiValuedRdn() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
         String rdn = "cn=Kate Bush+sn=Bush";
@@ -113,7 +113,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateContexts() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         /*
          * create ou=testing00,ou=system
@@ -214,7 +214,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testFailCreateExisting() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attribute attribute;
         Attributes attributes;
@@ -271,7 +271,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateContextWithCompositeName() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute objclass = new BasicAttribute( "objectClass" );
@@ -295,7 +295,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateContextWithBasicAttributesCaseSensitive() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         /*
          * create ou=testing00,ou=system
@@ -396,7 +396,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateContextWithNoObjectClass() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
 
@@ -415,7 +415,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateJavaContainer() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         
         DirContext ctx = (DirContext)sysRoot.createSubcontext( "cn=subtest" );
         assertNotNull( ctx );
@@ -434,7 +434,7 @@ public class CreateContextIT extends Abs
     @Test
     public void testCreateJavaContainerBadRDN() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         try
         {

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java Thu Feb 17 17:50:50 2011
@@ -64,7 +64,7 @@ public class DIRSERVER169IT extends Abst
      */
     protected void createData() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes people = new BasicAttributes( true );
         Attribute attribute = new BasicAttribute( "objectClass" );
@@ -96,10 +96,10 @@ public class DIRSERVER169IT extends Abst
         // @todo replace with ldif tags
         createData();
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 
@@ -144,7 +144,7 @@ public class DIRSERVER169IT extends Abst
         createData();
 
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java Thu Feb 17 17:50:50 2011
@@ -78,7 +78,7 @@ public class DIRSERVER783IT extends Abst
         String rdn = "cn=Fiona Apple";
 
         Hashtable<String,Object> env = new Hashtable<String, Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java Thu Feb 17 17:50:50 2011
@@ -92,7 +92,7 @@ public class DIRSERVER791IT extends Abst
     protected void createData() throws Exception
     {
         Attributes entry = this.getTestEntryAttributes();
-        getSystemContext( service ).createSubcontext( "cn=test", entry );
+        getSystemContext( getService() ).createSubcontext( "cn=test", entry );
     }
 
 
@@ -111,7 +111,7 @@ public class DIRSERVER791IT extends Abst
     {
         createData();
         Hashtable<String, Object> env = new Hashtable<String, Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
         DirContext ctx = new InitialDirContext( env );
@@ -146,7 +146,7 @@ public class DIRSERVER791IT extends Abst
     {
         createData();
         Hashtable<String, Object> env = new Hashtable<String, Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
         DirContext ctx = new InitialDirContext( env );
@@ -184,7 +184,7 @@ public class DIRSERVER791IT extends Abst
     {
         createData();
         Hashtable<String, Object> env = new Hashtable<String, Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
         DirContext ctx = new InitialDirContext( env );
@@ -238,7 +238,7 @@ public class DIRSERVER791IT extends Abst
     {
         createData();
         Hashtable<String, Object> env = new Hashtable<String, Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName() );
         env.put( Context.PROVIDER_URL, "ou=system" );
         DirContext ctx = new InitialDirContext( env );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java Thu Feb 17 17:50:50 2011
@@ -74,7 +74,7 @@ public class DestroyContextIT extends Ab
     @Test
     public void testDestroyContext() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         /*
          * delete ou=testing00,ou=system

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java Thu Feb 17 17:50:50 2011
@@ -53,7 +53,7 @@ public class ExtensibleObjectIT extends 
     @Test
     public void testExtensibleObjectModify() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         Attributes attributes = new BasicAttributes( true );
         Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );
@@ -101,7 +101,7 @@ public class ExtensibleObjectIT extends 
     @Test
     public void testExtensibleObjectAdd() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         Attributes attributes = new BasicAttributes( true );
         Attribute attribute = new BasicAttribute( "objectClass" );
         attribute.add( "top" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Thu Feb 17 17:50:50 2011
@@ -57,10 +57,10 @@ public class ListIT extends AbstractLdap
     public void testListSystemAsNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) ); 
 
-        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
+        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), getService(), "ou=system" );
         HashSet<String> set = new HashSet<String>();
         NamingEnumeration<NameClassPair> list = sysRoot.list( "" );
 
@@ -80,10 +80,10 @@ public class ListIT extends AbstractLdap
     public void testListUsersAsNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) );
 
-        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
+        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), getService(), "ou=system" );
         HashSet<String> set = new HashSet<String>();
         NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );
 
@@ -101,7 +101,7 @@ public class ListIT extends AbstractLdap
     @Test
     public void testListSystemAsAdmin() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         HashSet<String> set = new HashSet<String>();
         NamingEnumeration<NameClassPair> list = sysRoot.list( "" );
 
@@ -120,11 +120,11 @@ public class ListIT extends AbstractLdap
     @Test
     public void testListUsersAsAdmin() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         HashSet<String> set = new HashSet<String>();
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) ); 
                 
 
         NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java Thu Feb 17 17:50:50 2011
@@ -83,7 +83,7 @@ public class MixedCaseIT extends Abstrac
     @Test
     public void testSearch() throws Exception
     {
-        LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
+        LdapContext ctxRoot = getContext( "uid=admin,ou=system", getService(), SUFFIX_DN );
 
         SearchControls sc = new SearchControls();
         sc.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -100,7 +100,7 @@ public class MixedCaseIT extends Abstrac
     @Test
     public void testAdd() throws Exception
     {
-        LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
+        LdapContext ctxRoot = getContext( "uid=admin,ou=system", getService(), SUFFIX_DN );
 
         String dn = "ou=Test";
 
@@ -125,7 +125,7 @@ public class MixedCaseIT extends Abstrac
     @Test
     public void testModify() throws Exception
     {
-        LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
+        LdapContext ctxRoot = getContext( "uid=admin,ou=system", getService(), SUFFIX_DN );
 
         String dn = "ou=Test";
         String description = "New Value";
@@ -161,7 +161,7 @@ public class MixedCaseIT extends Abstrac
     @Test
     public void testDelete() throws Exception
     {
-        LdapContext ctxRoot = getContext( "uid=admin,ou=system", service, SUFFIX_DN );
+        LdapContext ctxRoot = getContext( "uid=admin,ou=system", getService(), SUFFIX_DN );
 
         String dn = "ou=Test";
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Thu Feb 17 17:50:50 2011
@@ -65,10 +65,10 @@ public class ModifyContextIT extends Abs
     protected void createData() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) );
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         /*
          * create ou=testing00,ou=system
@@ -177,7 +177,7 @@ public class ModifyContextIT extends Abs
     {
         createData();
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attribute attr = new BasicAttribute( "description" );
         Attributes attrs = new BasicAttributes( true );
@@ -205,7 +205,7 @@ public class ModifyContextIT extends Abs
     {
         createData();
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         Attributes attributes = new BasicAttributes( true );
         attributes.put( "ou", "testCases" );
         sysRoot.modifyAttributes( "ou=testing00", DirContext.ADD_ATTRIBUTE, attributes );
@@ -239,7 +239,7 @@ public class ModifyContextIT extends Abs
     {
         createData();
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         Attributes attributes = new BasicAttributes( true );
         attributes.put( "ou", "testCases" );
         
@@ -261,7 +261,7 @@ public class ModifyContextIT extends Abs
     {
         createData();
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         Attributes attributes = new BasicAttributes( true );
         attributes.put( "ou", "testCases" );
         sysRoot.modifyAttributes( "ou=testing00", DirContext.REMOVE_ATTRIBUTE, attributes );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Thu Feb 17 17:50:50 2011
@@ -63,11 +63,11 @@ public class ObjStateFactoryIT extends A
     public void testObjectFactory() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) );
 
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         sysRoot.addToEnvironment( Context.OBJECT_FACTORIES, PersonObjectFactory.class.getName() );
         Object obj = sysRoot.lookup( "uid=akarasulu, ou=users" );
         Attributes attrs = sysRoot.getAttributes( "uid=akarasulu, ou=users" );
@@ -85,7 +85,7 @@ public class ObjStateFactoryIT extends A
     @Test
     public void testStateFactory() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         sysRoot.addToEnvironment( Context.STATE_FACTORIES, PersonStateFactory.class.getName() );
         Person p = new Person( "Rodriguez", "Mr. Kerberos", "noices", "555-1212", "sn=erodriguez", "committer" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java Thu Feb 17 17:50:50 2011
@@ -53,7 +53,7 @@ public class RFC2713IT extends AbstractL
     @SuppressWarnings("unchecked")
     public void testSerialization() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         ArrayList<String> colors = new ArrayList<String>();
         colors.add( "red" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Thu Feb 17 17:50:50 2011
@@ -100,11 +100,11 @@ public class ReferralIT extends Abstract
         String ref0 = "ldap://fermi:10389/ou=users,ou=system";
         String ref1 = "ldap://hertz:10389/ou=users,dc=example,dc=com";
         String ref2 = "ldap://maxwell:10389/ou=users,ou=system";
-        td.rootCtx = getSystemContext( service );
+        td.rootCtx = getSystemContext( getService() );
 
         LdifEntry akarasulu = getUserAddLdif();
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ), true ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ), true ); 
 
         // -------------------------------------------------------------------
         // Adds a referral entry regardless of referral handling settings
@@ -329,7 +329,7 @@ public class ReferralIT extends Abstract
         // encounter referral errors with referral setting set to throw.
         // -------------------------------------------------------------------
         Dn userDn = new Dn( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
-        Entry userEntry = new DefaultEntry( service.getSchemaManager(), userDn);
+        Entry userEntry = new DefaultEntry( getService().getSchemaManager(), userDn);
         
         userEntry.add(  "ObjectClass", "top", "person" );
         userEntry.add( "sn", "karasulu" );
@@ -337,7 +337,7 @@ public class ReferralIT extends Abstract
 
         try
         {
-            service.getAdminSession().add( userEntry );
+            getService().getAdminSession().add( userEntry );
             fail( "Should fail here throwing a ReferralException" );
         }
         catch ( LdapPartialResultException lpre )
@@ -1184,7 +1184,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )
@@ -1221,7 +1221,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )
@@ -1257,7 +1257,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )
@@ -1293,7 +1293,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )
@@ -1329,7 +1329,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )
@@ -1365,7 +1365,7 @@ public class ReferralIT extends Abstract
         //create subcontext
         try
         {
-            getSystemContext( service ).createSubcontext( base, attrs );
+            getSystemContext( getService() ).createSubcontext( base, attrs );
             fail( "Should not reach this state" );
         }
         catch ( NamingException ne )

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java Thu Feb 17 17:50:50 2011
@@ -63,7 +63,7 @@ public class RootDSEIT extends AbstractL
     public void testGetInitialContext() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -85,7 +85,7 @@ public class RootDSEIT extends AbstractL
     public void testGetInitialContextLookupAttributes() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -112,7 +112,7 @@ public class RootDSEIT extends AbstractL
     public void testGetInitialContextLookupAttributesByName() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -140,7 +140,7 @@ public class RootDSEIT extends AbstractL
     public void testGetInitialContextLookupAttributesByNameWithOC() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -168,7 +168,7 @@ public class RootDSEIT extends AbstractL
     public void testDelete() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -203,7 +203,7 @@ public class RootDSEIT extends AbstractL
     public void testRename() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -238,7 +238,7 @@ public class RootDSEIT extends AbstractL
     public void testModify() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -273,7 +273,7 @@ public class RootDSEIT extends AbstractL
     public void testModify2() throws NamingException
     {
         Hashtable<String,Object> env = new Hashtable<String,Object>();
-        env.put( DirectoryService.JNDI_KEY, service );
+        env.put( DirectoryService.JNDI_KEY, getService() );
         env.put( Context.PROVIDER_URL, "" );
         env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Thu Feb 17 17:50:50 2011
@@ -69,7 +69,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testValidUniqueMember() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -141,7 +141,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testValidUniqueMemberWithOptionnalUID() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -213,7 +213,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testInvalidUniqueMemberBadDN() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -247,7 +247,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testInvalidUniqueMemberBadUID() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -276,7 +276,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testSearchUniqueMemberFilter() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -328,7 +328,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testSearchUniqueMemberFilterWithSpaces() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -380,7 +380,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testSearchUniqueMemberFilterWithBadDN() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );
@@ -419,7 +419,7 @@ public class UniqueMemberIT extends Abst
     @Test
     public void testSearchUniqueMemberFilterWithUID() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( true );
         Attribute oc = new BasicAttribute( "ObjectClass", "top" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Thu Feb 17 17:50:50 2011
@@ -116,7 +116,7 @@ public class AddReferralIT extends Abstr
     @Before
     public void setUp() throws Exception
     {
-        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=MNN,c=WW,ou=system" );
+        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
 
         // JNDI entry
         userEntry = new BasicAttributes( "objectClass", "top", true );
@@ -126,7 +126,7 @@ public class AddReferralIT extends Abstr
         
         // Core API entry
         Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultEntry( getService().getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -188,7 +188,7 @@ public class AddReferralIT extends Abstr
     @Test
     public void testAddNewEntryWithReferralAncestorCoreAPImanageDsaIT() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -247,7 +247,7 @@ public class AddReferralIT extends Abstr
     @Test
     public void testAddNewEntryWithReferralAncestorCoreAPINoManageDsaIT() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
 
         try
         {

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Thu Feb 17 17:50:50 2011
@@ -121,7 +121,7 @@ public class CompareReferralIT extends A
     @Before
     public void setUp() throws Exception
     {
-        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=MNN,c=WW,ou=system" );
+        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
 
         // JNDI entry
         userEntry = new BasicAttributes( "objectClass", "top", true );
@@ -131,7 +131,7 @@ public class CompareReferralIT extends A
         
         // Core API entry
         Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultEntry( getService().getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -230,7 +230,7 @@ public class CompareReferralIT extends A
     @Test
     public void testCompareEntryWithAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -264,7 +264,7 @@ public class CompareReferralIT extends A
     @Test
     public void testCompareEntryWithAncestorCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -384,7 +384,7 @@ public class CompareReferralIT extends A
     @Test
     public void testCompareExistingEntryReferralCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -418,7 +418,7 @@ public class CompareReferralIT extends A
     @Test
     public void testCompareExistingEntryReferralCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         assertTrue( session.compare( new Dn( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", true ) );
     }

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Thu Feb 17 17:50:50 2011
@@ -112,7 +112,7 @@ public class DeleteReferralIT extends Ab
     @Before
     public void setUp() throws Exception
     {
-        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=MNN,c=WW,ou=system" );
+        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
 
         // JNDI entry
         userEntry = new BasicAttributes( "objectClass", "top", true );
@@ -122,7 +122,7 @@ public class DeleteReferralIT extends Ab
         
         // Core API entry
         Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultEntry( getService().getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -186,7 +186,7 @@ public class DeleteReferralIT extends Ab
     @Test
     public void testDeleteEntryWithAncestorCoreAPI() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -206,7 +206,7 @@ public class DeleteReferralIT extends Ab
     @Test
     public void testDeleteExistingEntryNotReferral() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dn = new Dn( "cn=Alex Karasulu,o=MNN,c=WW,ou=system" );
         
         session.delete( dn );
@@ -265,7 +265,7 @@ public class DeleteReferralIT extends Ab
     @Test
     public void testDeleteExistingEntryReferralJNDIIgnore() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
 
         // Set to 'throw'
         MNNCtx.addToEnvironment( Context.REFERRAL, "ignore" );
@@ -294,7 +294,7 @@ public class DeleteReferralIT extends Ab
     @Test
     public void testDeleteExistingEntryReferralCoreAPINoManageDSAIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
 
         try
@@ -329,7 +329,7 @@ public class DeleteReferralIT extends Ab
     @Test
     public void testDeleteExistingEntryReferralCoreAPIManageDSAIT() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
 
         session.delete( dn, true );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Thu Feb 17 17:50:50 2011
@@ -48,12 +48,12 @@ 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.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultModification;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.*;
 import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.model.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -124,7 +124,7 @@ public class ModifyReferralIT extends Ab
     @Before
     public void setUp() throws Exception
     {
-        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=MNN,c=WW,ou=system" );
+        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
 
         // JNDI entry
         userEntry = new BasicAttributes( "objectClass", "top", true );
@@ -134,7 +134,7 @@ public class ModifyReferralIT extends Ab
         
         // Core API entry
         Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultEntry( getService().getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -237,7 +237,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyEntryWithAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -265,7 +265,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyEntryWithAncestorCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -373,7 +373,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyExistingEntryReferralCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         try
         {
@@ -414,7 +414,7 @@ public class ModifyReferralIT extends Ab
     @Test
     public void testModifyExistingEntryReferralCoreAPIManageDsaIT() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         
         EntryAttribute attr = new DefaultEntryAttribute( "Description", "This is a description" );
         Modification mod = new DefaultModification(

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Thu Feb 17 17:50:50 2011
@@ -139,9 +139,9 @@ public class MoveAndRenameReferralIT ext
     @Before
     public void setUp() throws Exception
     {
-        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=MNN,c=WW,ou=system" );
-        PNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "o=PNN,c=WW,ou=system" );
-        WWCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, service, "c=WW,ou=system" );
+        MNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=MNN,c=WW,ou=system" );
+        PNNCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "o=PNN,c=WW,ou=system" );
+        WWCtx = getContext( ServerDNConstants.ADMIN_SYSTEM_DN, getService(), "c=WW,ou=system" );
 
         // JNDI entry
         userEntry = new BasicAttributes( "objectClass", "top", true );
@@ -151,7 +151,7 @@ public class MoveAndRenameReferralIT ext
         
         // Core API entry
         Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
+        serverEntry = new DefaultEntry( getService().getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );
@@ -237,7 +237,7 @@ public class MoveAndRenameReferralIT ext
     @Test
     public void testMoveAndRenameEntrySuperiorHasReferralAncestorCoreAPIWithoutManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
         Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "cn=Alex" );
@@ -274,7 +274,7 @@ public class MoveAndRenameReferralIT ext
     @Test
     public void testMoveAndRenameSuperiorHasReferralAncestorCoreAPIWithManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
         Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "cn=Alex" );
@@ -425,7 +425,7 @@ public class MoveAndRenameReferralIT ext
     @Test
     public void testMoveAndRenameIsReferralCoreAPIWithoutManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
         Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "cn=Alex" );
@@ -462,7 +462,7 @@ public class MoveAndRenameReferralIT ext
     @Test
     public void testMoveAndRenameIsReferralCoreAPIWithManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
         Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "cn=Alex" );



Mime
View raw message