directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1071728 [1/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
Author: elecharny
Date: Thu Feb 17 17:50:50 2011
New Revision: 1071728

URL: http://svn.apache.org/viewvc?rev=1071728&view=rev
Log:
o Added a Dn( SchemaManager, Dn ) constructor
o Used the Dn( SchemaManager, Dn ) constructor in the server
o Made the service field private in AbstractLdapTestUnit
o Fixed the tests accordingly

Modified:
    directory/apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/getRootDse/GetRootDsePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMVAttributeIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyMultipleChangesIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchWithIndicesIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java
    directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java
    directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
    directory/apacheds/branches/m1/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
    directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointAddIT.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyDelIT.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java
    directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java
    directory/apacheds/branches/m1/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
    directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java

Modified: directory/apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java (original)
+++ directory/apacheds/branches/m1/core-annotations/src/main/java/org/apache/directory/server/core/factory/DSAnnotationProcessor.java Thu Feb 17 17:50:50 2011
@@ -158,7 +158,7 @@ public class DSAnnotationProcessor
                 // that type.
                 partition = createPartition.type().newInstance();
                 partition.setId( createPartition.name() );
-                partition.setSuffix( new Dn( createPartition.suffix() ) );
+                partition.setSuffix( new Dn( service.getSchemaManager(), createPartition.suffix() ) );
 
                 if ( partition instanceof BTreePartition<?> )
                 {

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Thu Feb 17 17:50:50 2011
@@ -288,7 +288,7 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
     {
-        return compare( new Dn( dn ), attributeName, value );
+        return compare( new Dn( schemaManager, dn ), attributeName, value );
     }
 
 
@@ -297,7 +297,7 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( String dn, String attributeName, String value ) throws LdapException
     {
-        return compare( new Dn( dn ), attributeName, value );
+        return compare( new Dn( schemaManager, dn ), attributeName, value );
     }
 
 
@@ -328,7 +328,7 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
     {
-        return compare( new Dn( dn ), attributeName, value );
+        return compare( new Dn( schemaManager, dn ), attributeName, value );
     }
 
 
@@ -384,7 +384,7 @@ public class LdapCoreSessionConnection i
      */
     public DeleteResponse delete( String dn ) throws LdapException
     {
-        return delete( new Dn( dn ) );
+        return delete( new Dn( schemaManager, dn ) );
     }
 
 
@@ -483,7 +483,7 @@ public class LdapCoreSessionConnection i
      */
     public Entry lookup( String dn, String... attributes ) throws LdapException
     {
-        return _lookup( new Dn( dn ), null, attributes );
+        return _lookup( new Dn( schemaManager, dn ), null, attributes );
     }
 
 
@@ -492,7 +492,7 @@ public class LdapCoreSessionConnection i
      */
     public Entry lookup( String dn, Control[] controls, String... attributes ) throws LdapException
     {
-        return _lookup( new Dn( dn ), controls, attributes );
+        return _lookup( new Dn( schemaManager, dn ), controls, attributes );
     }
 
 
@@ -524,7 +524,7 @@ public class LdapCoreSessionConnection i
      */
     public boolean exists( String dn ) throws LdapException
     {
-        return exists( new Dn( dn ) );
+        return exists( new Dn( schemaManager, dn ) );
     }
 
 
@@ -565,7 +565,7 @@ public class LdapCoreSessionConnection i
      */
     public Entry lookup( String dn ) throws LdapException
     {
-        return _lookup( new Dn( dn ), null );
+        return _lookup( new Dn( schemaManager, dn ), null );
     }
 
 
@@ -623,7 +623,7 @@ public class LdapCoreSessionConnection i
      */
     public ModifyResponse modify( String dn, Modification... modifications ) throws LdapException
     {
-        return modify( new Dn( dn ), modifications );
+        return modify( new Dn( schemaManager, dn ), modifications );
     }
 
 
@@ -828,7 +828,7 @@ public class LdapCoreSessionConnection i
             throw new IllegalArgumentException( msg );
         }
 
-        return move( new Dn( entryDn ), new Dn( newSuperiorDn ) );
+        return move( new Dn( schemaManager, entryDn ), new Dn( schemaManager, newSuperiorDn ) );
     }
 
 
@@ -874,7 +874,7 @@ public class LdapCoreSessionConnection i
      */
     public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
     {
-        return rename( new Dn( entryDn ), new Rdn( newRdn ), deleteOldRdn );
+        return rename( new Dn( schemaManager, entryDn ), new Rdn( newRdn ), deleteOldRdn );
     }
 
 
@@ -897,7 +897,7 @@ public class LdapCoreSessionConnection i
             throw new IllegalArgumentException( msg );
         }
 
-        return rename( new Dn( entryDn ), new Rdn( newRdn ) );
+        return rename( new Dn( schemaManager, entryDn ), new Rdn( newRdn ) );
     }
 
 
@@ -919,7 +919,7 @@ public class LdapCoreSessionConnection i
      */
     public ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
     {
-        return moveAndRename( new Dn( entryDn ), new Dn( newDn ), true );
+        return moveAndRename( new Dn( schemaManager, entryDn ), new Dn( schemaManager, newDn ), true );
     }
 
 
@@ -976,7 +976,7 @@ public class LdapCoreSessionConnection i
      */
     public ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn ) throws LdapException
     {
-        return moveAndRename( new Dn( entryDn ), new Dn( newDn ), deleteOldRdn );
+        return moveAndRename( new Dn( schemaManager, entryDn ), new Dn( schemaManager, newDn ), deleteOldRdn );
     }
 
 
@@ -1044,7 +1044,7 @@ public class LdapCoreSessionConnection i
     public SearchCursor search( String baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
-        return search( new Dn( baseDn ), filter, scope, attributes );
+        return search( new Dn( schemaManager, baseDn ), filter, scope, attributes );
     }
 
 
@@ -1224,7 +1224,7 @@ public class LdapCoreSessionConnection i
      */
     public BindResponse bind( String name, String credentials ) throws LdapException, IOException
     {
-        return bind( new Dn( name ), credentials );
+        return bind( new Dn( schemaManager, name ), credentials );
     }
 
 

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Thu Feb 17 17:50:50 2011
@@ -44,7 +44,7 @@ public final class LdapPrincipal impleme
     private static final long serialVersionUID = 3906650782395676720L;
 
     /** the normalized distinguished name of the principal */
-    private Dn dn;
+    private Dn dn = Dn.EMPTY_DN;
 
     /** the no name anonymous user whose Dn is the empty String */
     public static final LdapPrincipal ANONYMOUS = new LdapPrincipal();
@@ -104,7 +104,6 @@ public final class LdapPrincipal impleme
      */
     public LdapPrincipal()
     {
-        dn = new Dn();
         authenticationLevel = AuthenticationLevel.NONE;
         userPassword = null;
     }

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Thu Feb 17 17:50:50 2011
@@ -40,7 +40,7 @@ public class NotificationCriteria
 {
     public static final SearchScope DEFAULT_SCOPE = SearchScope.ONELEVEL;
     public static final AliasDerefMode DEFAULT_ALIAS_DEREF_MODE = AliasDerefMode.DEREF_ALWAYS;
-    public static final Dn DEFAULT_BASE = new Dn();
+    public static final Dn DEFAULT_BASE = null;
     public static final ExprNode DEFAULT_FILTER = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
     
     private SearchScope scope = DEFAULT_SCOPE;
@@ -110,15 +110,6 @@ public class NotificationCriteria
 
 
     /**
-     * @param base the base to set
-     */
-    public void setBase( String base ) throws Exception
-    {
-        this.base = new Dn( base );
-    }
-
-
-    /**
      * @return the base
      */
     public Dn getBase()

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Thu Feb 17 17:50:50 2011
@@ -22,9 +22,9 @@ package org.apache.directory.server.core
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 
@@ -85,12 +85,10 @@ public class MoveAndRenameOperationConte
             throwReferral();
         }
 
-        newDn = newSuperiorDn.add(newRdn);
 
         try
         {
-            newDn.normalize( session.getDirectoryService()
-                .getSchemaManager() );
+            newDn = new Dn( session.getDirectoryService().getSchemaManager(), newSuperiorDn.add(newRdn) );
         }
         catch ( LdapInvalidDnException lide )
         {

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java Thu Feb 17 17:50:50 2011
@@ -506,8 +506,8 @@ public class SchemaPartitionDaoImpl impl
     public Dn findDn( String entityName ) throws Exception
     {
         Entry sr = find( entityName );
-        Dn dn = sr.getDn();
-        dn.normalize( schemaManager );
+        Dn dn = new Dn( schemaManager, sr.getDn() );
+
         return dn;
     }
 

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Thu Feb 17 17:50:50 2011
@@ -327,8 +327,7 @@ public abstract class AbstractRegistrySy
 
         for ( Entry result : results )
         {
-            Dn dn = result.getDn();
-            dn.normalize( schemaManager );
+            Dn dn = new Dn( schemaManager, result.getDn() );
             oids.add( dn.getRdn().getNormValue().getString() );
         }
 

Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Thu Feb 17 17:50:50 2011
@@ -159,9 +159,7 @@ public class SchemaSynchronizer implemen
     public void add( Entry entry ) throws LdapException
     {
         Dn dn = entry.getDn();
-        Dn parentDn = dn;
-        parentDn = parentDn.remove( parentDn.size() - 1 );
-        parentDn.normalize( schemaManager );
+        Dn parentDn = new Dn( schemaManager, dn.getParent() );
 
         if ( !parentDn.equals(ouSchemaDn) )
         {

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Thu Feb 17 17:50:50 2011
@@ -40,8 +40,6 @@ import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -60,12 +58,15 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.util.exception.Exceptions;
 import org.apache.directory.shared.util.Strings;
+import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Test the DefaultEntry class.
@@ -139,7 +140,7 @@ public class SchemaAwareEntryTest
         atSN = schemaManager.lookupAttributeTypeRegistry( "sn" );
         atPwd = schemaManager.lookupAttributeTypeRegistry( "userpassword" );
 
-        EXAMPLE_DN = new Dn( "dc=example,dc=com" );
+        EXAMPLE_DN = new Dn( schemaManager, "dc=example,dc=com" );
     }
 
 
@@ -650,7 +651,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we can't inject a null AT
@@ -711,7 +712,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtBytesElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -792,7 +793,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtServerValueElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -909,7 +910,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test a simple addition
@@ -962,7 +963,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdBytesElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1020,7 +1021,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdServerValueElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1132,7 +1133,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test a simple addition
@@ -1182,7 +1183,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtBytesElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1240,7 +1241,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtServerValueElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1803,7 +1804,7 @@ public class SchemaAwareEntryTest
 
         assertEquals( EXAMPLE_DN, entry.getDn() );
 
-        Dn testDn = new Dn( "cn=test" );
+        Dn testDn = new Dn( schemaManager, "cn=test" );
         entry.setDn( testDn );
 
         assertEquals( testDn, entry.getDn() );
@@ -1821,7 +1822,7 @@ public class SchemaAwareEntryTest
 
         assertEquals( entry1.hashCode(), entry2.hashCode() );
 
-        entry2.setDn( new Dn( "ou=system,dc=com" ) );
+        entry2.setDn( new Dn( schemaManager, "ou=system,dc=com" ) );
         assertNotSame( entry1.hashCode(), entry2.hashCode() );
 
         entry2.setDn( EXAMPLE_DN );
@@ -2603,7 +2604,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutServerAttributeElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // first test a null SA addition. It should be allowed.
@@ -2684,7 +2685,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "dc=test" );
+        Dn dn = new Dn( schemaManager, "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test an empty AT
@@ -2741,7 +2742,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtByteElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test an empty AT
@@ -2804,7 +2805,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtSVs() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Adding a null value to an attribute
@@ -2865,7 +2866,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIdStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "dc=test" );
+        Dn dn = new Dn( schemaManager, "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Adding a null value should be possible
@@ -2927,7 +2928,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIdBytesElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -2991,7 +2992,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtStringElipsis() throws Exception
     {
-        Dn dn = new Dn( "dc=test" );
+        Dn dn = new Dn( schemaManager, "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3055,7 +3056,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtBytesElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -3130,7 +3131,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtSVElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3201,7 +3202,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDSVElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3537,7 +3538,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testRemoveUpIdElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -3597,7 +3598,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testSetATElipsis() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         List<EntryAttribute> result = null;
@@ -3677,7 +3678,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testSetUpID() throws Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         List<EntryAttribute> result = null;
 
@@ -3859,7 +3860,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testToBasicAttributes() throws InvalidNameException, Exception
     {
-        Dn dn = new Dn( "cn=test" );
+        Dn dn = new Dn( schemaManager, "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
@@ -3950,7 +3951,7 @@ public class SchemaAwareEntryTest
     public void testCopyConstructorClientEntry() throws LdapException
     {
         Entry clientEntry = new DefaultEntry();
-        clientEntry.setDn( new Dn( "ou=system" ) );
+        clientEntry.setDn( new Dn( schemaManager, "ou=system" ) );
         clientEntry.add( "cn", "test1", "test2" );
         clientEntry.add( "objectClass", "top", "person" );
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java Thu Feb 17 17:50:50 2011
@@ -22,19 +22,19 @@ package org.apache.directory.server.core
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.shared.ldap.model.entry.*;
+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.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
@@ -64,7 +64,7 @@ public class AdministrativePointServiceI
     @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/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Thu Feb 17 17:50:50 2011
@@ -33,11 +33,11 @@ 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.server.core.integ.IntegrationUtils;
-import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
 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.message.BindResponse;
 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.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Strings;
@@ -88,7 +88,7 @@ public class SimpleAuthenticationIT exte
     public void testAdminAccountCreation() throws Exception
     {
         String userDn = "uid=admin,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "secret" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "secret" );
 
         Entry entry = connection.lookup( userDn );
         performAdminAccountChecks( entry );
@@ -96,10 +96,10 @@ public class SimpleAuthenticationIT exte
             .getBytesUtf8("secret") ) );
         connection.close();
 
-        service.shutdown();
-        service.startup();
+        getService().shutdown();
+        getService().startup();
 
-        connection = getConnectionAs( service, userDn, "secret" );
+        connection = getConnectionAs( getService(), userDn, "secret" );
         entry = connection.lookup( userDn );
         performAdminAccountChecks( entry );
         assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), Strings
@@ -111,9 +111,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void test3UseAkarasulu() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         Entry entry = connection.lookup( userDn );
         EntryAttribute ou = entry.get( "ou" );
@@ -149,7 +149,7 @@ public class SimpleAuthenticationIT exte
     public void test8PassPrincAuthTypeSimple() throws Exception
     {
         String userDn = "uid=admin,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "secret" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "secret" );
         assertTrue( connection.isAuthenticated() );
         connection.close();
     }
@@ -164,9 +164,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void test10TestNonAdminUser() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
         assertTrue( connection.isAuthenticated() );
         connection.close();
     }
@@ -175,10 +175,10 @@ public class SimpleAuthenticationIT exte
     @Test
     public void test11InvalidateCredentialCache() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
 
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         Entry entry = connection.lookup( userDn );
         EntryAttribute ou = entry.get( "ou" );
@@ -242,9 +242,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testSHA() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
 
@@ -285,9 +285,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testSSHA() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
         Entry entry = connection.lookup( userDn );
@@ -325,9 +325,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testSSHA4BytesSalt() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
         Entry entry = connection.lookup( userDn );
@@ -365,9 +365,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testMD5() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
         Entry entry = connection.lookup( userDn );
@@ -406,9 +406,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testSMD5() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
         Entry entry = connection.lookup( userDn );
@@ -446,9 +446,9 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testCRYPT() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
 
         // Check that we can get the attributes
         Entry entry = connection.lookup( userDn );
@@ -485,11 +485,11 @@ public class SimpleAuthenticationIT exte
     @Test
     public void testInvalidateCredentialCacheForUpdatingAnotherUsersPassword() throws Exception
     {
-        apply( service, getUserAddLdif() );
+        apply( getService(), getUserAddLdif() );
 
         // bind as akarasulu
         String userDn = "uid=akarasulu,ou=users,ou=system";
-        LdapConnection connection = getConnectionAs( service, userDn, "test" );
+        LdapConnection connection = getConnectionAs( getService(), userDn, "test" );
         connection.close();
 
         // bind as admin

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Thu Feb 17 17:50:50 2011
@@ -43,19 +43,27 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy;
 import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 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.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 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.exception.LdapException;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.model.message.*;
+import org.apache.directory.shared.ldap.model.message.AddRequest;
+import org.apache.directory.shared.ldap.model.message.AddRequestImpl;
+import org.apache.directory.shared.ldap.model.message.AddResponse;
+import org.apache.directory.shared.ldap.model.message.Control;
+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.junit.After;
 import org.junit.Before;
@@ -101,9 +109,9 @@ public class PasswordPolicyTest extends 
 
         PpolicyConfigContainer policyContainer = new PpolicyConfigContainer();
         policyContainer.setDefaultPolicy( policyConfig );
-        service.setPwdPolicies( policyContainer );
+        getService().setPwdPolicies( policyContainer );
         
-        AuthenticationInterceptor authInterceptor = ( AuthenticationInterceptor ) service
+        AuthenticationInterceptor authInterceptor = ( AuthenticationInterceptor ) getService()
         .getInterceptor( AuthenticationInterceptor.class.getName() );
         
         authInterceptor.loadPwdPolicyStateAtributeTypes();
@@ -120,7 +128,7 @@ public class PasswordPolicyTest extends 
     @Test
     public void testAddUserWithClearTextPwd() throws Exception
     {
-        LdapConnection connection = getAdminNetworkConnection( ldapServer );
+        LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
         
         Dn userDn = new Dn( "cn=user,ou=system" );
         Entry userEntry = LdifUtils.createEntry( userDn, "ObjectClass: top", "ObjectClass: person", "cn: user",

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -56,8 +56,8 @@ public class AddAuthorizationIT extends 
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
-        service.setAccessControlEnabled( true );
+        AutzIntegUtils.service = getService();
+        getService().setAccessControlEnabled( true );
     }
 
 
@@ -167,13 +167,13 @@ public class AddAuthorizationIT extends 
         // Now, make sure the ACI is persisted if we stop and restart the server
         // Stop the server now, we will restart it immediately 
         // And shutdown the DS too
-        service.shutdown();
-        assertFalse( service.isStarted() );
+        getService().shutdown();
+        assertFalse( getService().isStarted() );
 
         // And restart
-        service.startup();
+        getService().startup();
 
-        assertTrue( service.isStarted() );
+        assertTrue( getService().isStarted() );
 
         // try an add operation which should succeed with ACI and group membership change
         assertTrue( checkCanAddEntryAs( "billyd", "billyd", "ou=testou" ) );

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java Thu Feb 17 17:50:50 2011
@@ -53,7 +53,7 @@ public class AdministratorsGroupIT exten
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
 
@@ -119,7 +119,7 @@ public class AdministratorsGroupIT exten
     public void testDefaultNonAdminReadAccessToGroups() throws Exception
     {
         Dn billydDn = createUser( "billyd", "s3kr3t" );
-        assertFalse( service.isAccessControlEnabled() );
+        assertFalse( getService().isAccessControlEnabled() );
         LdapConnection connection = getConnectionAs( billydDn, "s3kr3t" );
 
         // billyd should not be able to read the admin group

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Thu Feb 17 17:50:50 2011
@@ -38,8 +38,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
-import org.apache.directory.shared.ldap.model.message.*;
+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.Response;
+import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
@@ -64,7 +67,7 @@ public class AuthorizationServiceAsAdmin
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Thu Feb 17 17:50:50 2011
@@ -75,12 +75,12 @@ public class AuthorizationServiceAsNonAd
     {
         LdifEntry akarasulu = getUserAddLdif();
 
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
-            service.getAdminSession().delete( new Dn( "uid=admin,ou=system") );
+            getService().getAdminSession().delete( new Dn( "uid=admin,ou=system") );
             fail( "User 'admin' should not be able to delete his account" );
         }
         catch ( LdapNoPermissionException e )
@@ -100,12 +100,12 @@ public class AuthorizationServiceAsNonAd
     {
         LdifEntry akarasulu = getUserAddLdif();
 
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) );
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) );
 
         try
         {
-            service.getAdminSession().rename( 
+            getService().getAdminSession().rename( 
                 new Dn( "uid=admin,ou=system" ),
                 new Rdn( "uid=alex" ),
                 false );
@@ -128,11 +128,11 @@ public class AuthorizationServiceAsNonAd
     {
         LdifEntry akarasulu = getUserAddLdif();
         
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) ); 
         
         // Read the entry we just created using the akarasuluSession
-        Entry readEntry = service.getAdminSession().lookup( akarasulu.getDn(), new String[]{ "userPassword"} );
+        Entry readEntry = getService().getAdminSession().lookup( akarasulu.getDn(), new String[]{ "userPassword"} );
         
         assertTrue( Arrays.equals( akarasulu.get( "userPassword" ).getBytes(), readEntry.get( "userPassword" ).getBytes() ) );
 
@@ -143,9 +143,9 @@ public class AuthorizationServiceAsNonAd
         Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
         mods.add( mod );
       
-        Dn userDn = new Dn( service.getSchemaManager(), "uid=akarasulu,ou=users,ou=system" );
+        Dn userDn = new Dn( getService().getSchemaManager(), "uid=akarasulu,ou=users,ou=system" );
         LdapPrincipal principal = new LdapPrincipal( userDn, AuthenticationLevel.SIMPLE );
-        CoreSession akarasuluSession = service.getSession( principal );
+        CoreSession akarasuluSession = getService().getSession( principal );
 
         try
         {
@@ -169,13 +169,13 @@ public class AuthorizationServiceAsNonAd
     {
         LdifEntry akarasulu = getUserAddLdif();
         
-        service.getAdminSession().add( 
-            new DefaultEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
+        getService().getAdminSession().add( 
+            new DefaultEntry( getService().getSchemaManager(), akarasulu.getEntry() ) ); 
 
         try
         {
-            ExprNode filter = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
-            service.getAdminSession().search( new Dn( "ou=system" ), SearchScope.SUBTREE, filter , AliasDerefMode.DEREF_ALWAYS, null );
+            ExprNode filter = FilterParser.parse( getService().getSchemaManager(), "(objectClass=*)" );
+            getService().getAdminSession().search( new Dn( "ou=system" ), SearchScope.SUBTREE, filter , AliasDerefMode.DEREF_ALWAYS, null );
         }
         catch ( LdapNoPermissionException e )
         {

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Thu Feb 17 17:50:50 2011
@@ -54,8 +54,8 @@ public class AuthzAuthnIT extends Abstra
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
-        service.setAccessControlEnabled( true );
+        AutzIntegUtils.service = getService();
+        getService().setAccessControlEnabled( true );
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -59,7 +59,7 @@ public class CompareAuthorizationIT exte
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -58,7 +58,7 @@ public class DeleteAuthorizationIT exten
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -47,7 +47,7 @@ public class GeneralAuthorizationIT exte
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
     
     @After

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -56,7 +56,7 @@ public class LookupAuthorizationIT exten
     @Before
     public void init()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
     
@@ -66,12 +66,12 @@ public class LookupAuthorizationIT exten
     @Test
     public void testLookupACIEnabled() throws Exception
     {
-        service.setAccessControlEnabled( true );
+        getService().setAccessControlEnabled( true );
         Dn dn = new Dn( "cn=test,ou=system" );
         
         try
         {      
-            Entry entry = service.getSession().lookup( dn );
+            Entry entry = getService().getSession().lookup( dn );
             fail();
         }
         catch ( LdapNoPermissionException lnpe )
@@ -98,7 +98,7 @@ public class LookupAuthorizationIT exten
             "  } " +
             "}" );
         
-        Entry entry = service.getSession().lookup( dn );
+        Entry entry = getService().getSession().lookup( dn );
         
         assertNotNull( entry );
         

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -37,13 +37,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 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;
 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.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+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.message.ModifyResponse;
@@ -68,7 +68,7 @@ public class ModifyAuthorizationIT exten
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -61,8 +61,8 @@ public class MoveRenameAuthorizationIT e
     @Before
     public void setService()
     {
-        AutzIntegUtils.service = service;
-        service.setAccessControlEnabled( true );
+        AutzIntegUtils.service = getService();
+        getService().setAccessControlEnabled( true );
     }
 
 

Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=1071728&r1=1071727&r2=1071728&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Thu Feb 17 17:50:50 2011
@@ -76,7 +76,7 @@ public class SearchAuthorizationIT exten
     @Before
     public void setService() throws Exception
     {
-        AutzIntegUtils.service = service;
+        AutzIntegUtils.service = getService();
         reusableAdminCon = getAdminConnection();
     }
 



Mime
View raw message