directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1071728 [3/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/jndi/referral/MoveReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.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/MoveReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Thu Feb 17 17:50:50 2011
@@ -130,9 +130,9 @@ public class MoveReferralIT extends Abst
     @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 );
@@ -142,7 +142,7 @@ public class MoveReferralIT extends Abst
         
         // 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" );
@@ -229,7 +229,7 @@ public class MoveReferralIT extends Abst
     @Test
     public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithoutManageDsaIt() 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( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
         
@@ -265,7 +265,7 @@ public class MoveReferralIT extends Abst
     @Test
     public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithManageDsaIt() 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( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
         
@@ -457,7 +457,7 @@ public class MoveReferralIT extends Abst
     @Test
     public void testMoveEntryWithReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn orig = new Dn( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
         Dn dest = new Dn( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
         
@@ -493,7 +493,7 @@ public class MoveReferralIT extends Abst
     @Test
     public void testMoveEntryWithReferralAncestorCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn orig = new Dn( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
         Dn dest = new Dn( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
         

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.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/RenameReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Thu Feb 17 17:50:50 2011
@@ -129,7 +129,7 @@ public class RenameReferralIT 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 );
@@ -139,7 +139,7 @@ public class RenameReferralIT 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" );
@@ -206,7 +206,7 @@ public class RenameReferralIT extends Ab
     @Test
     public void testRenameNotExistingSuperiorReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
 
         try
         {
@@ -316,7 +316,7 @@ public class RenameReferralIT extends Ab
     @Test
     public void testRenameExistingReferralCoreApiWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
 
         try
         {
@@ -403,7 +403,7 @@ public class RenameReferralIT extends Ab
     @Test
     public void testRenameRdnExistIsReferralCoreAPIWithoutManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "ou=People" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.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/RenameReferralIgnoreIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java Thu Feb 17 17:50:50 2011
@@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapEntryAlreadyExistsException;
 import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.model.exception.LdapPartialResultException;
-import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -127,7 +127,7 @@ public class RenameReferralIgnoreIT exte
     @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 );
@@ -137,7 +137,7 @@ public class RenameReferralIgnoreIT exte
         
         // 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" );
@@ -172,7 +172,7 @@ public class RenameReferralIgnoreIT exte
     @Test
     public void testRenameNotExistingSuperiorReferralAncestorCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         try
         {
             Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
@@ -237,7 +237,7 @@ public class RenameReferralIgnoreIT exte
     @Test
     public void testRenameExistingReferralCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dnRoles = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
         Dn dnGroups = new Dn( "ou=Groups,o=MNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "ou=Groups" );
@@ -304,7 +304,7 @@ public class RenameReferralIgnoreIT exte
     @Test
     public void testRenameRdnExistIsReferralCoreAPIWithManageDsaIt() throws Exception
     {
-        CoreSession session = service.getAdminSession();
+        CoreSession session = getService().getAdminSession();
         Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
         Rdn newRdn = new Rdn( "ou=People" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.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/SearchReferralIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Thu Feb 17 17:50:50 2011
@@ -131,7 +131,7 @@ public class SearchReferralIT 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 );
@@ -141,7 +141,7 @@ public class SearchReferralIT 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" );
@@ -234,7 +234,7 @@ public class SearchReferralIT extends Ab
     @Test
     public void testSearchWithReferralAncestorCoreAPIWithoutManageDSAIt() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
@@ -269,7 +269,7 @@ public class SearchReferralIT extends Ab
     @Test
     public void testSearchWithReferralAncestorCoreAPIWithManageDSAIt() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
@@ -386,7 +386,7 @@ public class SearchReferralIT extends Ab
     @Test
     public void testSearchExistingReferralCoreAPIWithoutManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
@@ -420,7 +420,7 @@ public class SearchReferralIT extends Ab
     @Test
     public void testSearchExistingReferralCoreAPIWithManageDsaIT() throws Exception
     {
-        CoreSession coreSession = service.getAdminSession();
+        CoreSession coreSession = getService().getAdminSession();
         Dn dn = new Dn( "ou=roles,o=Mnn,c=WW,ou=system" );
         
         EntryFilteringCursor cursor = coreSession.search( dn, "(ObjectClass=*)", true );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java Thu Feb 17 17:50:50 2011
@@ -65,7 +65,7 @@ ou: corporate category\, operations
 
          */
 
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         Attributes attrs = new BasicAttributes( "objectClass", "organizationalUnit", true );
         attrs.put( "ou", "direct report view" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Thu Feb 17 17:50:50 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 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.*;
+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.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
@@ -72,7 +72,7 @@ public class OperationalAttributeService
     @Before
     public void setup() throws Exception
     {
-        connection = IntegrationUtils.getAdminConnection( service );
+        connection = IntegrationUtils.getAdminConnection( getService() );
 
         // add this entry before each test because we want 
         // to check that operational attributes are added

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java Thu Feb 17 17:50:50 2011
@@ -71,10 +71,10 @@ public class AddPerfIT extends AbstractL
     @Test
     public void testAddPerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=test,ou=system" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );
@@ -103,7 +103,7 @@ public class AddPerfIT extends AbstractL
 
             String name = "test" + i;
             dn = new Dn( "cn=" + name + ",ou=system" );
-            entry = new DefaultEntry( service.getSchemaManager(), dn );
+            entry = new DefaultEntry( getService().getSchemaManager(), dn );
             entry.add( "ObjectClass", "top", "person" );
             entry.add( "sn", name.toUpperCase() );
             entry.add( "cn", name );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java Thu Feb 17 17:50:50 2011
@@ -36,7 +36,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.*;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 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;
@@ -68,7 +68,7 @@ public class PasswordHashingInterceptorT
     @Test
     public void testAddWithPlainPassword() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         byte[] plainPwd = "secret".getBytes();
         Dn dn = new Dn( "cn=test,ou=system" );
@@ -84,12 +84,12 @@ public class PasswordHashingInterceptorT
     @Test
     public void testModifyWithPlainPassword() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         byte[] plainPwd = "newsecret".getBytes();
         Dn dn = new Dn( "cn=test,ou=system" );
 
-        AttributeType pwdAtType = service.getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+        AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
         EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( plainPwd );
@@ -108,13 +108,13 @@ public class PasswordHashingInterceptorT
     @Test
     public void testAddWithHashedPassword() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         byte[] plainPwd = "secret".getBytes();
         byte[] hashedPwd = PasswordUtil.createStoragePassword( plainPwd, LdapSecurityConstants.HASH_METHOD_SSHA );
         
         Dn dn = new Dn( "cn=testHash,ou=system" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "testHash" );
@@ -132,14 +132,14 @@ public class PasswordHashingInterceptorT
     @Test
     public void testModifyWithHashedPassword() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         byte[] plainPwd = "xyzsecret".getBytes();
         byte[] hashedPwd = PasswordUtil.createStoragePassword( plainPwd, LdapSecurityConstants.HASH_METHOD_SSHA256 );
 
         Dn dn = new Dn( "cn=test,ou=system" );
 
-        AttributeType pwdAtType = service.getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
+        AttributeType pwdAtType = getService().getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
         
         EntryAttribute pwdAt = new DefaultEntryAttribute( pwdAtType );
         pwdAt.add( hashedPwd );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Thu Feb 17 17:50:50 2011
@@ -95,7 +95,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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" );
 
@@ -138,7 +138,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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" );
 
@@ -177,7 +177,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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" );
 
@@ -216,7 +216,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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" );
 
@@ -257,7 +257,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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() );
 
         // Bind on the rootDSE
@@ -336,7 +336,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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() );
 
         // Bind on the rootDSE
@@ -371,10 +371,10 @@ public class SimpleBindIT extends Abstra
     @Test
     public void testSimpleBindAPrincipalNullPassword() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getConnectionAs( service, "uid=admin,ou=system", null );
+        LdapConnection connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", null );
         assertFalse( connection.isAuthenticated() );
 
-        connection = IntegrationUtils.getConnectionAs( service, "uid=admin,ou=system", "secret" );
+        connection = IntegrationUtils.getConnectionAs( getService(), "uid=admin,ou=system", "secret" );
 
         BindResponse bindResp = connection.bind( "uid=admin,ou=system", null );
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, bindResp.getLdapResult().getResultCode() );
@@ -392,7 +392,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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() );
 
         // Bind on the rootDSE
@@ -430,7 +430,7 @@ public class SimpleBindIT extends Abstra
         // We will bind using JNDI
         // Set up the environment for creating the initial context
         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/operations/compare/CompareDirserver1139IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java Thu Feb 17 17:50:50 2011
@@ -66,7 +66,7 @@ public class CompareDirserver1139IT exte
         // Enable the nis schema
         // -------------------------------------------------------------------
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
         
@@ -88,9 +88,9 @@ public class CompareDirserver1139IT exte
         // Enable the krb5kdc schema
         // -------------------------------------------------------------------
         // Check if krb5kdc is loaded
-        if ( !service.getSchemaManager().isSchemaLoaded( "krb5kdc" ) )
+        if ( !getService().getSchemaManager().isSchemaLoaded( "krb5kdc" ) )
         {
-            service.getSchemaManager().load( "krb5kdc" );
+            getService().getSchemaManager().load( "krb5kdc" );
         }
 
         // check if krb5kdc is disabled
@@ -159,7 +159,7 @@ public class CompareDirserver1139IT exte
     @Test
     public void testCompare() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         
         injectEntries( sysRoot);
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java Thu Feb 17 17:50:50 2011
@@ -71,10 +71,10 @@ public class ComparePerfIT extends Abstr
     @Test
     public void testComparePerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=test,dc=example,dc=com" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java Thu Feb 17 17:50:50 2011
@@ -70,10 +70,10 @@ public class DeletePerfIT extends Abstra
     @Test
     public void testDeleteOne() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=test,dc=example,dc=com" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );
@@ -95,10 +95,10 @@ public class DeletePerfIT extends Abstra
     @Test
     public void testDeletePerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=test,dc=example,dc=com" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );
@@ -120,7 +120,7 @@ public class DeletePerfIT extends Abstra
             
             String name = "test" + i;
             dn = new Dn( "cn=" + name + ",dc=example,dc=com" );
-            entry = new DefaultEntry( service.getSchemaManager(), dn );
+            entry = new DefaultEntry( getService().getSchemaManager(), dn );
             entry.add( "ObjectClass", "top", "person" );
             entry.add( "sn", name.toUpperCase() );
             entry.add( "cn", name );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java Thu Feb 17 17:50:50 2011
@@ -59,7 +59,7 @@ public class ExistsIT extends AbstractLd
     @Before
     public void setup() 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/operations/getRootDse/GetRootDsePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java Thu Feb 17 17:50:50 2011
@@ -43,8 +43,8 @@ public class GetRootDsePerfIT extends Ab
     @Test
     public void testPerfGetRootDSE() throws Exception
     {
-        GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( service.getAdminSession() );
-        Entry rootDSE = service.getOperationManager().getRootDSE( getRootDseContext );
+        GetRootDSEOperationContext getRootDseContext = new GetRootDSEOperationContext( getService().getAdminSession() );
+        Entry rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext );
 
         assertNotNull( rootDSE );
         int nbIterations = 150000;
@@ -68,7 +68,7 @@ public class GetRootDsePerfIT extends Ab
                 t00 = System.currentTimeMillis();
             }
 
-            rootDSE = service.getOperationManager().getRootDSE( getRootDseContext );
+            rootDSE = getService().getOperationManager().getRootDSE( getRootDseContext );
         }
         
         long t1 = System.currentTimeMillis();

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java Thu Feb 17 17:50:50 2011
@@ -44,8 +44,8 @@ public class hasEntryPerfIT extends Abst
     public void testPerfHasEntry() throws Exception
     {
         Dn adminDn = new Dn( "uid=admin, ou=system" );
-        EntryOperationContext hasEntryContext = new EntryOperationContext( service.getAdminSession(), adminDn );
-        boolean hasEntry = service.getOperationManager().hasEntry( hasEntryContext );
+        EntryOperationContext hasEntryContext = new EntryOperationContext( getService().getAdminSession(), adminDn );
+        boolean hasEntry = getService().getOperationManager().hasEntry( hasEntryContext );
 
         assertTrue( hasEntry );
         int nbIterations = 150000;
@@ -69,7 +69,7 @@ public class hasEntryPerfIT extends Abst
                 t00 = System.currentTimeMillis();
             }
 
-            hasEntry = service.getOperationManager().hasEntry( hasEntryContext );
+            hasEntry = getService().getOperationManager().hasEntry( hasEntryContext );
         }
         
         long t1 = System.currentTimeMillis();

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java Thu Feb 17 17:50:50 2011
@@ -47,8 +47,8 @@ public class ListPerfIT extends Abstract
     @Test
     public void testPerfList() throws Exception
     {
-        ListOperationContext listContext = new ListOperationContext( service.getAdminSession(), new Dn( "ou=system" ) );
-        EntryFilteringCursor cursor = service.getOperationManager().list( listContext );
+        ListOperationContext listContext = new ListOperationContext( getService().getAdminSession(), new Dn( "ou=system" ) );
+        EntryFilteringCursor cursor = getService().getOperationManager().list( listContext );
 
         assertNotNull( cursor );
         int nb = 0;
@@ -87,7 +87,7 @@ public class ListPerfIT extends Abstract
             }
 
             nb = 0;
-            cursor = service.getOperationManager().list( listContext );
+            cursor = getService().getOperationManager().list( listContext );
 
             while ( cursor.next() )
             {

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java Thu Feb 17 17:50:50 2011
@@ -66,7 +66,7 @@ public class LookupIT extends AbstractLd
     @Before
     public void setup() throws Exception
     {
-        connection = IntegrationUtils.getAdminConnection( service );
+        connection = IntegrationUtils.getAdminConnection( getService() );
     }
 
 
@@ -104,7 +104,7 @@ public class LookupIT extends AbstractLd
     @Ignore( "The '+' special attribute is not correctly handled." )
     public void testLookupPlus() throws Exception
     {
-        service.setDenormalizeOpAttrsEnabled( true );
+        getService().setDenormalizeOpAttrsEnabled( true );
         Entry entry = connection.lookup( "cn=test,ou=system", "+" );
         assertNotNull( entry );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java Thu Feb 17 17:50:50 2011
@@ -56,7 +56,7 @@ public class LookupPerfIT extends Abstra
     @Ignore("Ignore atm, this is a perf test")
     public void testPerfLookup() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Entry entry = connection.lookup( "cn=test,ou=system", "+" );
 
@@ -98,7 +98,7 @@ public class LookupPerfIT extends Abstra
     @Before
     public void init()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service= getService();
     }
 
 
@@ -108,9 +108,9 @@ public class LookupPerfIT extends Abstra
     @Test
     public void testLookupPerfACIEnabled() throws Exception
     {
-        service.setAccessControlEnabled( true );
+        getService().setAccessControlEnabled( true );
         Dn dn = new Dn( "cn=test,ou=system" );
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         createAccessControlSubentry( "anybodySearch", "{ " + "  identificationTag \"searchAci\", "
             + "  precedence 14, " + "  authenticationLevel none, " + "  itemOrUserFirst userFirst: " + "  { "

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java Thu Feb 17 17:50:50 2011
@@ -217,7 +217,7 @@ public class ModifyAddIT extends Abstrac
         // -------------------------------------------------------------------
 
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
         
@@ -255,7 +255,7 @@ public class ModifyAddIT extends Abstrac
         attrs.get( "objectClass" ).add( "posixGroup" );
         attrs.put( "cn", name );
         attrs.put( "gidNumber", String.valueOf( gid ) );
-        return getSystemContext( service ).createSubcontext( "cn="+name+",ou=groups", attrs );
+        return getSystemContext( getService() ).createSubcontext( "cn="+name+",ou=groups", attrs );
     }
 
 
@@ -282,7 +282,7 @@ public class ModifyAddIT extends Abstrac
     @Test
     public void testModifyAddExistingEntryNotExistingATValidAVA() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A new description attribute value
@@ -308,7 +308,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyAddExistingEntryNotExistingATNotInMayValidAVA() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A valid AT not in MUST or MAY
@@ -325,7 +325,7 @@ public class ModifyAddIT extends Abstrac
     @Test
     public void testModifyAddExistingEntryNotExistingATNotInMayExtensibleObjectOCValidAVA() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A valid AT not in MUST or MAY, but the extensibleObject OC is present in the OCs
@@ -350,7 +350,7 @@ public class ModifyAddIT extends Abstrac
     @Test
     public void testModifyAddExistingEntryNotExistingAtEmptyValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A valid AT not in MUST or MAY, but the extensibleObject OC is present in the OCs
@@ -375,7 +375,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributeValueException.class )
     public void testModifyAddExistingEntrySingleValuedATWithTwoValues() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // 
@@ -396,7 +396,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributesException.class )
     public void testModifyAddExistingEntryNotExistingATInvalidAVA() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An invalid AT
@@ -412,7 +412,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributesException.class )
     public void testModifyAddExistingEntryNotExistingATInvalidAVAExtensibleObjectInOcs() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An invalid AT
@@ -428,7 +428,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributeValueException.class )
     public void testModifyAddExistingEntryExistingATInvalidValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An invalid AT value
@@ -445,7 +445,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributeValueException.class )
     public void testModifyAddExistingEntryExistingATInvalidValueExtensibleObjectInOcs() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An invalid AT value
@@ -461,7 +461,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = NoPermissionException.class )
     public void testModifyAddExistingEntryOperationalAttribute() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An operationalAttribute
@@ -477,7 +477,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = NoPermissionException.class )
     public void testModifyAddExistingEntryOperationalAttributeExtensibleObjectInOcs() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An operational attribute
@@ -497,7 +497,7 @@ public class ModifyAddIT extends Abstrac
     @Test
     public void testModifyAddExistingEntryExistingATValidAVA() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A new description attribute value
@@ -524,7 +524,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = AttributeInUseException.class )
     public void testModifyAddExistingEntryExistingATExistingValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION, true );
@@ -540,7 +540,7 @@ public class ModifyAddIT extends Abstrac
     @Test
     public void testModifyAddExistingEntryExistingAtEmptyValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "crossCertificatePair", "12345".getBytes(), true );
@@ -569,7 +569,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributeValueException.class )
     public void testModifyAddExistingEntryExistingSingleValuedAT() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // The initial value
@@ -592,7 +592,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = AttributeInUseException.class )
     public void testModifyAddExistingEntryExistingSingleValuedATExistingValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // The initial value
@@ -615,7 +615,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = InvalidAttributeValueException.class )
     public void testModifyAddExistingEntryExistingATBadValue() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // The added value
@@ -659,7 +659,7 @@ public class ModifyAddIT extends Abstrac
     @Test( expected = NameNotFoundException.class )
     public void testModifyAddNotExistingEntry() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An operational attribute

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java Thu Feb 17 17:50:50 2011
@@ -225,7 +225,7 @@ public class ModifyDelIT extends Abstrac
         // -------------------------------------------------------------------
 
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
         
@@ -267,7 +267,7 @@ public class ModifyDelIT extends Abstrac
         test.put( "homeDirectory", "/" );
         test.put( "description", "A test account" );
         
-        getSystemContext( service ).createSubcontext( "cn=test", test );
+        getSystemContext( getService() ).createSubcontext( "cn=test", test );
         
     }
 
@@ -281,7 +281,7 @@ public class ModifyDelIT extends Abstrac
         attrs.get( "objectClass" ).add( "posixGroup" );
         attrs.put( "cn", name );
         attrs.put( "gidNumber", String.valueOf( gid ) );
-        return getSystemContext( service ).createSubcontext( "cn="+name+",ou=groups", attrs );
+        return getSystemContext( getService() ).createSubcontext( "cn="+name+",ou=groups", attrs );
     }
 
 
@@ -304,7 +304,7 @@ public class ModifyDelIT extends Abstrac
     @Test
     public void testModifyDelExistingEntryExistingATNotInRdnNotSV() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A new description attribute value
@@ -330,7 +330,7 @@ public class ModifyDelIT extends Abstrac
     @Test
     public void testModifyDelExistingEntryExistingATNotInRdnNotInMustNotSVAllValues() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A new description attribute value
@@ -355,7 +355,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyDelExistingEntryExistingATNotInRdnNotSVAllValues() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes sn = new BasicAttributes( "sn", "Wilde", true );
@@ -374,7 +374,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = NoSuchAttributeException.class )
     public void testModifyDelExistingEntryNonExistingATInMay() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A non existing AT 
@@ -390,7 +390,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = NoSuchAttributeException.class )
     public void testModifyDelExistingEntryNonExistingATNotInMayMust() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // A non existing AT 
@@ -406,7 +406,7 @@ public class ModifyDelIT extends Abstrac
     @Test
     public void testModifyDelExistingEntryExistingATNotInRdnSV() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "c", "FR", true );
@@ -426,7 +426,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyDelExistingEntryExistingATNotInRdnSVInMust() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "uidNumber", "1", true );
@@ -441,7 +441,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyDelExistingEntryExistingATPartOfRdn() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "cn", "test", true );
@@ -456,7 +456,7 @@ public class ModifyDelIT extends Abstrac
     @Test
     public void testModifyDelExistingEntryExistingATNoInRdnNotInMust() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "description", null, true );
@@ -476,7 +476,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyDelExistingEntryExistingATNoInRdnInMust() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "sn", null, true );
@@ -491,7 +491,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = SchemaViolationException.class )
     public void testModifyDelExistingEntryExistingATInRdn() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "cn", null, true );
@@ -506,7 +506,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = NoSuchAttributeException.class )
     public void testModifyDelExistingEntryValueNotPresentInExistingAT() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         Attributes attrs = new BasicAttributes( "description", "Not present", true );
@@ -547,7 +547,7 @@ public class ModifyDelIT extends Abstrac
     @Test( expected = NameNotFoundException.class )
     public void testModifyDelNotExistingEntry() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         // An operational attribute

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java Thu Feb 17 17:50:50 2011
@@ -64,7 +64,7 @@ public class ModifyMVAttributeIT extends
     @Ignore( "Ignore atm, this is a perf test" )
     public void testAdd1000Members() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         
         // Add 10000 members
         Attributes attrs = new BasicAttributes( "uniqueMember", true );
@@ -91,7 +91,7 @@ public class ModifyMVAttributeIT extends
     @Ignore( "Ignore atm, this is a perf test" )
     public void testAdd500Members() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         long t0 = System.currentTimeMillis();
         
         // Add 600 members

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java Thu Feb 17 17:50:50 2011
@@ -85,7 +85,7 @@ public class ModifyMultipleChangesIT ext
         // Enable the nis schema
         // -------------------------------------------------------------------
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
         
@@ -127,7 +127,7 @@ public class ModifyMultipleChangesIT ext
         test.put( "homeDirectory", "/" );
         test.put( "description", "A test account" );
         
-        getSystemContext( service ).createSubcontext( "cn=test", test );
+        getSystemContext( getService() ).createSubcontext( "cn=test", test );
     }
 
 
@@ -140,7 +140,7 @@ public class ModifyMultipleChangesIT ext
         attrs.get( "objectClass" ).add( "posixGroup" );
         attrs.put( "cn", name );
         attrs.put( "gidNumber", String.valueOf( gid ) );
-        return getSystemContext( service ).createSubcontext( "cn="+name+",ou=groups", attrs );
+        return getSystemContext( getService() ).createSubcontext( "cn="+name+",ou=groups", attrs );
     }
 
 
@@ -151,7 +151,7 @@ public class ModifyMultipleChangesIT ext
     @Test
     public void testModifyMultipleChangeDeleteAddSnInMust() throws Exception 
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
         
         // Try to delete and add the SN which is in MUST

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Thu Feb 17 17:50:50 2011
@@ -30,15 +30,16 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.model.entry.*;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 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.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.model.name.Dn;
-import org.junit.Test;
 import org.junit.Ignore;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 
@@ -73,10 +74,10 @@ public class ModifyPerfIT extends Abstra
     @Ignore ( "We should not have performance tests mixed with integration tests" )
     public void testModifyPerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=test,ou=system" );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java Thu Feb 17 17:50:50 2011
@@ -70,7 +70,7 @@ public class MovePerfIT extends Abstract
     @Test
     public void testMovePerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         String oldDn = "cn=test,ou=system";
         String newDn = "cn=test,ou=users,ou=system";
@@ -78,7 +78,7 @@ public class MovePerfIT extends Abstract
         String newSuperior = "ou=users,ou=system";
 
         Dn dn = new Dn( oldDn );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java Thu Feb 17 17:50:50 2011
@@ -74,12 +74,12 @@ public class MoveAndRenamePerfIT extends
     @Test
     public void testMovePerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn oldDn = new Dn( "cn=testOld,ou=system" );
         Dn newDn = new Dn( "cn=testNew,ou=users,ou=system" );
 
-        Entry entry = new DefaultEntry( service.getSchemaManager(), oldDn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), oldDn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TESTOld" );
         entry.add( "cn", "testOld" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java Thu Feb 17 17:50:50 2011
@@ -69,12 +69,12 @@ public class RenamePerfIT extends Abstra
     @Test
     public void testRenamePerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         String oldDn ="cn=test0,ou=system";
 
         Dn dn = new Dn( oldDn );
-        Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
+        Entry entry = new DefaultEntry( getService().getSchemaManager(), dn );
         entry.add( "ObjectClass", "top", "person" );
         entry.add( "sn", "TEST" );
         entry.add( "cn", "test0" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java Thu Feb 17 17:50:50 2011
@@ -439,9 +439,9 @@ public class AliasSearchIT extends Abstr
         {
             Dn base = new Dn( "dc=example,dc=com" );
             SearchScope scope = SearchScope.SUBTREE;
-            ExprNode exprNode = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
+            ExprNode exprNode = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
             AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
-            EntryFilteringCursor cursor = service.getAdminSession()
+            EntryFilteringCursor cursor = getService().getAdminSession()
                 .search( base, scope, exprNode, aliasDerefMode, null );
 
             // advancing the cursor forward and backward must give the same result
@@ -482,9 +482,9 @@ public class AliasSearchIT extends Abstr
         {
             Dn base = new Dn( "dc=example,dc=com" );
             SearchScope scope = SearchScope.SUBTREE;
-            ExprNode exprNode = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
+            ExprNode exprNode = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
             AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
-            EntryFilteringCursor cursor = service.getAdminSession()
+            EntryFilteringCursor cursor = getService().getAdminSession()
                 .search( base, scope, exprNode, aliasDerefMode, null );
 
             // advancing the cursor backward and forward must give the same result
@@ -573,8 +573,8 @@ public class AliasSearchIT extends Abstr
     {
         List<String> nextResults = new ArrayList<String>();
 
-        ExprNode exprNode = FilterParser.parse(service.getSchemaManager(), filter);
-        EntryFilteringCursor cursor = service.getAdminSession().search( new Dn( base ), scope, exprNode,
+        ExprNode exprNode = FilterParser.parse(getService().getSchemaManager(), filter);
+        EntryFilteringCursor cursor = getService().getAdminSession().search( new Dn( base ), scope, exprNode,
             aliasDerefMode, null );
         cursor.beforeFirst();
         while ( cursor.next() )

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java Thu Feb 17 17:50:50 2011
@@ -61,7 +61,7 @@ public class DIRSERVER759IT extends Abst
      */
     protected void createData() throws Exception
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         /*
          * create ou=testing00,ou=system
@@ -166,7 +166,7 @@ public class DIRSERVER759IT extends Abst
     public void testSearchBadDN() throws Exception
     {
         createData();
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java Thu Feb 17 17:50:50 2011
@@ -133,7 +133,7 @@ public class SearchBinaryIT extends Abst
     @Test
     public void testSearchWithIndexBinaryAttribute() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         // Do a search with a filter based on certificate, get back all the entries
         Cursor<Response> responses = connection.search( "ou=system", "(userCertificate=*)",
@@ -209,7 +209,7 @@ public class SearchBinaryIT extends Abst
     // This test fails atm. Cf DIRSERVER-1389
     public void testSearchSubstrOnBinaryAttribute() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         // Check that searching for an entry using a valid SUBSTR filter works
         Cursor<Response> responses = connection.search( "ou=system", "(binaryAttribute=\\01\\02*)",

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Thu Feb 17 17:50:50 2011
@@ -60,9 +60,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.filter.*;
-import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
+import org.apache.directory.shared.ldap.model.filter.LessEqNode;
+import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.message.Response;
@@ -116,9 +117,9 @@ public class SearchIT extends AbstractLd
     @Before
     public void createData() throws Exception
     {
-        service.getSchemaManager().enable( "nis" );
+        getService().getSchemaManager().enable( "nis" );
 
-        sysRoot = getSystemContext( service );
+        sysRoot = getSystemContext( getService() );
 
         /*
          * Check ou=testing00,ou=system
@@ -187,7 +188,7 @@ public class SearchIT extends AbstractLd
         // -------------------------------------------------------------------
 
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
 
@@ -224,7 +225,7 @@ public class SearchIT extends AbstractLd
         Attributes attrs = LdifUtils.createAttributes("objectClass: top", "objectClass: posixGroup", "cn", name,
                 "gidNumber", String.valueOf(gid));
 
-        return getSystemContext( service ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
+        return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
     }
 
 
@@ -351,8 +352,8 @@ public class SearchIT extends AbstractLd
     @Test
     public void testBogusAttributeInSearchFilter() throws Exception
     {
-        boolean oldSetAllowAnnonymousAccess = service.isAllowAnonymousAccess();
-        service.setAllowAnonymousAccess( true );
+        boolean oldSetAllowAnnonymousAccess = getService().isAllowAnonymousAccess();
+        getService().setAllowAnonymousAccess( true );
 
         SearchControls cons = new SearchControls();
         NamingEnumeration<SearchResult> e = sysRoot.search( "", "(bogusAttribute=abc123)", cons );
@@ -377,7 +378,7 @@ public class SearchIT extends AbstractLd
         e = sysRoot.search( "", "(objectclass=*)", cons );
         assertNotNull( e );
 
-        service.setAllowAnonymousAccess( oldSetAllowAnnonymousAccess );
+        getService().setAllowAnonymousAccess( oldSetAllowAnnonymousAccess );
     }
 
 
@@ -584,7 +585,7 @@ public class SearchIT extends AbstractLd
     @Test
     public void testOpAttrDenormalizationOn() throws Exception
     {
-        service.setDenormalizeOpAttrsEnabled( true );
+        getService().setDenormalizeOpAttrsEnabled( true );
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
@@ -1003,7 +1004,7 @@ public class SearchIT extends AbstractLd
         }
 
         Set<String> results = new HashSet<String>();
-        NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "ou=groups", filter, controls );
+        NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "ou=groups", filter, controls );
 
         while ( list.hasMore() )
         {
@@ -1042,7 +1043,7 @@ public class SearchIT extends AbstractLd
         SearchControls controls = new SearchControls();
 
         Set<String> results = new HashSet<String>();
-        NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "", filter, controls );
+        NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "", filter, controls );
 
         while ( list.hasMore() )
         {
@@ -1071,7 +1072,7 @@ public class SearchIT extends AbstractLd
         }
 
         Set<String> results = new HashSet<String>();
-        NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "", filter, controls );
+        NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "", filter, controls );
 
         while ( list.hasMore() )
         {
@@ -1359,7 +1360,7 @@ public class SearchIT extends AbstractLd
     @Test
     public void testSearchWithQuotesInBase() throws NamingException
     {
-        LdapContext sysRoot = getSystemContext( service );
+        LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
 
         SearchControls ctls = new SearchControls();
@@ -1530,7 +1531,7 @@ public class SearchIT extends AbstractLd
         Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: groupOfUniqueNames",
             "cn: testGroup3", "uniqueMember: uid=admin,ou=system" );
 
-        getSystemContext( service ).createSubcontext( "cn=testGroup3,ou=groups", attrs );
+        getSystemContext( getService() ).createSubcontext( "cn=testGroup3,ou=groups", attrs );
 
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         String filter = "(|(&(|(2.5.4.0=posixgroup)(2.5.4.0=groupofuniquenames)(2.5.4.0=groupofnames)(2.5.4.0=group))(!(|(2.5.4.50=uid=admin,ou=system)(2.5.4.31=0.9.2342.19200300.100.1.1=admin,2.5.4.11=system))))(objectClass=referral))";
@@ -1667,7 +1668,7 @@ public class SearchIT extends AbstractLd
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
 
-        LdapContext nullRootCtx = getRootContext( service );
+        LdapContext nullRootCtx = getRootContext( getService() );
 
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=*)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
@@ -1692,7 +1693,7 @@ public class SearchIT extends AbstractLd
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
 
-        LdapContext nullRootCtx = getRootContext( service );
+        LdapContext nullRootCtx = getRootContext( getService() );
 
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=organizationalUnit)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
@@ -1717,7 +1718,7 @@ public class SearchIT extends AbstractLd
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         controls.setDerefLinkFlag( false );
 
-        LdapContext nullRootCtx = getRootContext( service );
+        LdapContext nullRootCtx = getRootContext( getService() );
 
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=domain)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
@@ -1742,7 +1743,7 @@ public class SearchIT extends AbstractLd
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
 
-        LdapContext nullRootCtx = getRootContext( service );
+        LdapContext nullRootCtx = getRootContext( getService() );
 
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(cn=*)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
@@ -1763,7 +1764,7 @@ public class SearchIT extends AbstractLd
     @Test
     public void testCsnLessEqualitySearch() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Dn dn = new Dn( "cn=testLowerCsnAdd,ou=system" );
         Entry entry = new DefaultEntry( dn );
@@ -1811,7 +1812,7 @@ public class SearchIT extends AbstractLd
         throws Exception
     {
         Value<String> val = new StringValue( filterCsnVal );
-        AttributeType entryCsnAt = service.getSchemaManager().getAttributeType( SchemaConstants.ENTRY_CSN_AT );
+        AttributeType entryCsnAt = getService().getSchemaManager().getAttributeType( SchemaConstants.ENTRY_CSN_AT );
         ExprNode filter = null;
 
         if ( useCaseNum == 1 )

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java Thu Feb 17 17:50:50 2011
@@ -49,7 +49,7 @@ public class SearchPerfIT extends Abstra
     @Test
     public void testSearchPerf() throws Exception
     {
-        LdapConnection connection = IntegrationUtils.getAdminConnection( service );
+        LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
 
         Cursor<Response> cursor = connection.search( "uid=admin,ou=system", "(ObjectClass=*)",
             SearchScope.OBJECT, "*" );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java Thu Feb 17 17:50:50 2011
@@ -68,7 +68,7 @@ public class SearchWithIndicesIT extends
         // -------------------------------------------------------------------
 
         // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( service );
+        LdapContext schemaRoot = getSchemaContext( getService() );
         Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
         boolean isNisDisabled = false;
 
@@ -86,7 +86,7 @@ public class SearchWithIndicesIT extends
             schemaRoot.modifyAttributes( "cn=nis", mods );
         }
 
-        Partition systemPartition = service.getSystemPartition();
+        Partition systemPartition = getService().getSystemPartition();
         DefaultDirectoryServiceFactory.DEFAULT.getPartitionFactory().addIndex( systemPartition, "gidNumber", 100 );
 
         // -------------------------------------------------------------------
@@ -107,7 +107,7 @@ public class SearchWithIndicesIT extends
         attrs.get( "objectClass" ).add( "posixGroup" );
         attrs.put( "cn", name );
         attrs.put( "gidNumber", String.valueOf( gid ) );
-        return getSystemContext( service ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
+        return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
     }
 
 
@@ -128,7 +128,7 @@ public class SearchWithIndicesIT extends
         }
 
         Set<String> results = new HashSet<String>();
-        NamingEnumeration<SearchResult> list = getSystemContext( service ).search( "ou=groups", filter, controls );
+        NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "ou=groups", filter, controls );
 
         while ( list.hasMore() )
         {



Mime
View raw message