directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [12/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -128,8 +128,8 @@ public class SubtreeEvaluatorTest
     {
         SubtreeSpecificationModifier modifier = new SubtreeSpecificationModifier();
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn, "objectClass" );
 
         assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) );
@@ -148,8 +148,8 @@ public class SubtreeEvaluatorTest
         SubtreeSpecificationModifier modifier = new SubtreeSpecificationModifier();
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn, "objectClass" );
 
         assertTrue( evaluator.evaluate( ss, apDn, entryDn, entry ) );
@@ -170,8 +170,8 @@ public class SubtreeEvaluatorTest
         modifier.setMaxBaseDistance( 3 );
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn, "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) );
@@ -197,7 +197,7 @@ public class SubtreeEvaluatorTest
     public void testWithMinMaxAndChopAfter() throws Exception
     {
         SubtreeSpecificationModifier modifier = new SubtreeSpecificationModifier();
-        Set<DN> chopAfter = new HashSet<DN>();
+        Set<Dn> chopAfter = new HashSet<Dn>();
         chopAfter.add( dnFactory.create( "uid=Tori Amos" ) );
         chopAfter.add( dnFactory.create( "ou=twolevels,uid=akarasulu" ) );
         modifier.setChopAfterExclusions( chopAfter );
@@ -205,8 +205,8 @@ public class SubtreeEvaluatorTest
         modifier.setMaxBaseDistance( 3 );
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn, "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) );
@@ -232,7 +232,7 @@ public class SubtreeEvaluatorTest
     public void testWithMinMaxAndChopBefore() throws Exception
     {
         SubtreeSpecificationModifier modifier = new SubtreeSpecificationModifier();
-        Set<DN> chopBefore = new HashSet<DN>();
+        Set<Dn> chopBefore = new HashSet<Dn>();
         chopBefore.add( dnFactory.create( "uid=Tori Amos" ) );
         chopBefore.add( dnFactory.create( "ou=threelevels,ou=twolevels,uid=akarasulu" ) );
         modifier.setChopBeforeExclusions( chopBefore );
@@ -240,8 +240,8 @@ public class SubtreeEvaluatorTest
         modifier.setMaxBaseDistance( 3 );
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn, "objectClass" );
 
         assertFalse( evaluator.evaluate( ss, apDn, entryDn, entry ) );
@@ -275,8 +275,8 @@ public class SubtreeEvaluatorTest
         modifier.setMaxBaseDistance( 3 );
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
         Entry entry = new DefaultEntry( schemaManager, entryDn );
         entry.put( "objectClass", "person" );
 
@@ -333,8 +333,8 @@ public class SubtreeEvaluatorTest
         modifier.setMaxBaseDistance( 3 );
         modifier.setBase( dnFactory.create( "ou=users" ) );
         SubtreeSpecification ss = modifier.getSubtreeSpecification();
-        DN apDn = dnFactory.create( "ou=system" );
-        DN entryDn = dnFactory.create( "ou=users,ou=system" );
+        Dn apDn = dnFactory.create( "ou=system" );
+        Dn entryDn = dnFactory.create( "ou=users,ou=system" );
 
         Entry entry = new DefaultEntry( schemaManager, entryDn );;
         entry.put( "objectClass", "person" );

Modified: directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java (original)
+++ directory/apacheds/trunk/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.bouncycastle.jce.provider.X509CertParser;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.Server;
@@ -176,7 +176,7 @@ public class HttpServer
             if ( httpsTransport != null )
             {
                 // load the admin entry to get the private key and certificate
-                DN adminDn = dirService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
+                Dn adminDn = dirService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
                 Entry adminEntry = dirService.getAdminSession().lookup( adminDn, new String[]{ "+" } );
                 
                 File confDir = dirService.getInstanceLayout().getConfDirectory();

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sun Jan 23 01:17:06 2011
@@ -69,7 +69,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -124,14 +124,14 @@ public class KeyDerivationInterceptor ex
      */
     public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        DN normName = addContext.getDn();
+        Dn normName = addContext.getDn();
 
         Entry entry = addContext.getEntry();
 
         if ( ( entry.get( SchemaConstants.USER_PASSWORD_AT ) != null ) &&
             ( entry.get( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ) != null ) )
         {
-            log.debug( "Adding the entry '{}' for DN '{}'.", entry, normName.getName() );
+            log.debug( "Adding the entry '{}' for Dn '{}'.", entry, normName.getName() );
 
             BinaryValue userPassword = (BinaryValue)entry.get( SchemaConstants.USER_PASSWORD_AT ).get();
             String strUserPassword = userPassword.getString();
@@ -158,7 +158,7 @@ public class KeyDerivationInterceptor ex
 
             entry.put( getKeyAttribute( addContext.getSession().getDirectoryService().getSchemaManager(), keys ) );
 
-            log.debug( "Adding modified entry '{}' for DN '{}'.", entry, normName
+            log.debug( "Adding modified entry '{}' for Dn '{}'.", entry, normName
                 .getName() );
         }
 
@@ -282,7 +282,7 @@ public class KeyDerivationInterceptor ex
     void lookupPrincipalAttributes( ModifyOperationContext modContext, ModifySubContext subContext )
         throws LdapException
     {
-        DN principalDn = modContext.getDn();
+        Dn principalDn = modContext.getDn();
 
         LookupOperationContext lookupContext = modContext.newLookupContext( principalDn );
         lookupContext.setByPassed( USERLOOKUP_BYPASS );
@@ -309,7 +309,7 @@ public class KeyDerivationInterceptor ex
         else
         {
             subContext.isPrincipal( true );
-            log.debug( "DN {} is a Kerberos principal.  Will attempt key derivation.", principalDn.getName() );
+            log.debug( "Dn {} is a Kerberos principal.  Will attempt key derivation.", principalDn.getName() );
         }
 
         if ( subContext.getPrincipalName() == null )

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 
 
 /**
- * A special index which stores RDN objects.
+ * A special index which stores Rdn objects.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializer.java Sun Jan 23 01:17:06 2011
@@ -74,13 +74,13 @@ public class ServerEntrySerializer imple
      * access to the registries to read back the values.
      * <p>
      * The structure used to store the entry is the following :
-     * <li><b>[DN length]</b> : can be -1 if we don't have a DN, 0 if the 
-     * DN is empty, otherwise contains the DN's length.<p> 
-     * <b>NOTE :</b>This should be unnecessary, as the DN should always exists
+     * <li><b>[Dn length]</b> : can be -1 if we don't have a Dn, 0 if the
+     * Dn is empty, otherwise contains the Dn's length.<p>
+     * <b>NOTE :</b>This should be unnecessary, as the Dn should always exists
      * <p>
      * </li>
      * <li>
-     * <b>DN</b> : The entry's DN. Can be empty (rootDSE)<p>
+     * <b>Dn</b> : The entry's Dn. Can be empty (rootDSE)<p>
      * </li>
      * <li>
      * <b>[nb attributes]</b> The number of attributes

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Sun Jan 23 01:17:06 2011
@@ -35,7 +35,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -248,13 +248,13 @@ public class JdbmRdnIndexTest
         initIndex();
         assertEquals( 0, idx.count() );
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         idx.add( key, 0l );
         assertEquals( 1, idx.count() );
 
         // setting a different parentId should make this key a different key
-        key = new ParentIdAndRdn<Long>( 1L, new RDN( "cn=key" ) );
+        key = new ParentIdAndRdn<Long>( 1L, new Rdn( "cn=key" ) );
         
         idx.add( key, 1l );
         assertEquals( 2, idx.count() );
@@ -263,7 +263,7 @@ public class JdbmRdnIndexTest
         idx.add( key, 2l );
         assertEquals( 2, idx.count() );
         
-        key = new ParentIdAndRdn<Long>( 2L, new RDN( "cn=key" ) );
+        key = new ParentIdAndRdn<Long>( 2L, new Rdn( "cn=key" ) );
         idx.add( key, 3l );
         assertEquals( 3, idx.count() );
     }
@@ -274,7 +274,7 @@ public class JdbmRdnIndexTest
     {
         initIndex();
         
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
         
         assertEquals( 0, idx.count( key ) );
 
@@ -292,7 +292,7 @@ public class JdbmRdnIndexTest
     {
         initIndex();
         
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key", schemaManager ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key", schemaManager ) );
         
         assertNull( idx.forwardLookup( key ) );
 
@@ -302,7 +302,7 @@ public class JdbmRdnIndexTest
         
         // check with the different case in UP name, this ensures that the custom
         // key comparator is used
-        key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=KEY", schemaManager ) );
+        key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=KEY", schemaManager ) );
         assertEquals( 0, ( long ) idx.forwardLookup( key ) );
         assertEquals( key, idx.reverseLookup( 0l ) );
     }
@@ -313,7 +313,7 @@ public class JdbmRdnIndexTest
     {
         initIndex();
         
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
         
         assertNull( idx.forwardLookup( key ) );
 
@@ -336,7 +336,7 @@ public class JdbmRdnIndexTest
     {
         initIndex();
         
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
         
         assertEquals( 0, idx.count() );
 
@@ -345,7 +345,7 @@ public class JdbmRdnIndexTest
         
         for( long i=1; i< 5; i++ )
         {
-            key = new ParentIdAndRdn<Long>( i, new RDN( "cn=key" + i ) );
+            key = new ParentIdAndRdn<Long>( i, new Rdn( "cn=key" + i ) );
             
             idx.add( key, ( long ) i );
         }
@@ -381,14 +381,14 @@ public class JdbmRdnIndexTest
 //    {
 //        initIndex();
 //        
-//        DN dn = new DN( "dc=example,dc=com" );
+//        Dn dn = new Dn( "dc=example,dc=com" );
 //        dn.normalize( schemaManager.getNormalizerMapping() );
 //        
-//        RDN rdn = new RDN( dn.getName() );
+//        Rdn rdn = new Rdn( dn.getName() );
 //        rdn._setParentId( 1 );
 //        idx.add( rdn, 0l );
 //        
-//        RDN rdn2 = idx.reverseLookup( 0l );
+//        Rdn rdn2 = idx.reverseLookup( 0l );
 //        System.out.println( rdn2 );
 //        InternalRdnComparator rdnCom = new InternalRdnComparator( "" );
 //        assertEquals( 0, rdnCom.compare( rdn, rdn2 ) );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sun Jan 23 01:17:06 2011
@@ -55,8 +55,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -86,7 +86,7 @@ public class JdbmStoreTest
     JdbmStore<Entry> store;
     private static SchemaManager schemaManager = null;
     private static LdifSchemaLoader loader;
-    private static DN EXAMPLE_COM;
+    private static Dn EXAMPLE_COM;
 
     /** The OU AttributeType instance */
     private static AttributeType OU_AT;
@@ -126,7 +126,7 @@ public class JdbmStoreTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        EXAMPLE_COM = new DN( "dc=example,dc=com", schemaManager );
+        EXAMPLE_COM = new Dn( "dc=example,dc=com", schemaManager );
 
         OU_AT = schemaManager.getAttributeType( SchemaConstants.OU_AT );
         DC_AT = schemaManager.getAttributeType( SchemaConstants.DC_AT );
@@ -188,7 +188,7 @@ public class JdbmStoreTest
 
     /**
      * Tests a suffix with two name components: dc=example,dc=com.
-     * When reading this entry back from the store the DN must
+     * When reading this entry back from the store the Dn must
      * consist of two RDNs.
      */
     @Test
@@ -212,7 +212,7 @@ public class JdbmStoreTest
         store2.init( schemaManager );
 
         // inject context entry
-        DN suffixDn = new DN( "dc=example,dc=com", schemaManager );
+        Dn suffixDn = new Dn( "dc=example,dc=com", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, suffixDn );
         entry.add( "objectClass", "top", "domain" );
         entry.add( "dc", "example" );
@@ -489,7 +489,7 @@ public class JdbmStoreTest
     @Test
     public void testFreshStore() throws Exception
     {
-        DN dn = new DN( "o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "o=Good Times Co.", schemaManager );
         assertEquals( 1L, ( long ) store.getEntryId( dn ) );
         assertEquals( 11, store.count() );
         assertEquals( "o=Good Times Co.", store.getEntryDn( 1L ).getName() );
@@ -523,7 +523,7 @@ public class JdbmStoreTest
         assertEquals( 10, store.count() );
 
         // add an alias and delete to test dropAliasIndices method
-        DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "ou", "Apache" );
@@ -571,7 +571,7 @@ public class JdbmStoreTest
         assertFalse( cursor.next() );
 
         // dn id 12
-        DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn martinDn = new Dn( "cn=Marting King,ou=Sales,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, martinDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Sales" );
@@ -585,9 +585,9 @@ public class JdbmStoreTest
         assertTrue( cursor.previous() );
         assertEquals( 12, ( long ) cursor.get().getId() );
 
-        DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co.", schemaManager );
+        Dn newParentDn = new Dn( "ou=Board of Directors,o=Good Times Co.", schemaManager );
 
-        DN newDn = newParentDn.add( martinDn.getRdn() );
+        Dn newDn = newParentDn.add( martinDn.getRdn() );
 
         store.move( martinDn, newParentDn, newDn, entry );
         cursor = idx.forwardCursor( 3L );
@@ -596,7 +596,7 @@ public class JdbmStoreTest
         assertEquals( 12, ( long ) cursor.get().getId() );
 
         // dn id 13
-        DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn marketingDn = new Dn( "ou=Marketing,ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, marketingDn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Marketing" );
@@ -605,7 +605,7 @@ public class JdbmStoreTest
         store.add( entry );
 
         // dn id 14
-        DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co.", schemaManager );
+        Dn jimmyDn = new Dn( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, jimmyDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Marketing" );
@@ -670,7 +670,7 @@ public class JdbmStoreTest
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {
-        DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Marting King,ou=Not Present,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Not Present" );
@@ -682,7 +682,7 @@ public class JdbmStoreTest
     @Test(expected = LdapSchemaViolationException.class)
     public void testAddWithoutObjectClass() throws Exception
     {
-        DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Martin King,ou=Sales,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "ou", "Sales" );
         entry.add( "cn", "Martin King" );
@@ -693,7 +693,7 @@ public class JdbmStoreTest
     @Test
     public void testModifyAddOUAttrib() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
@@ -710,7 +710,7 @@ public class JdbmStoreTest
     @Test
     public void testRename() throws Exception
     {
-        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
@@ -720,7 +720,7 @@ public class JdbmStoreTest
 
         store.add( entry );
 
-        RDN rdn = new RDN( "sn=James" );
+        Rdn rdn = new Rdn( "sn=James" );
 
         store.rename( dn, rdn, true );
     }
@@ -729,7 +729,7 @@ public class JdbmStoreTest
     @Test
     public void testRenameEscaped() throws Exception
     {
-        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
@@ -739,11 +739,11 @@ public class JdbmStoreTest
 
         store.add( entry );
 
-        RDN rdn = new RDN( "sn=Ja\\+es" );
+        Rdn rdn = new Rdn( "sn=Ja\\+es" );
 
         store.rename( dn, rdn, true );
 
-        DN dn2 = new DN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn2 = new Dn( "sn=Ja\\+es,ou=Engineering,o=Good Times Co.", schemaManager );
         Long id = store.getEntryId( dn2 );
         assertNotNull( id );
         Entry entry2 = store.lookup( id );
@@ -754,7 +754,7 @@ public class JdbmStoreTest
     @Test
     public void testMove() throws Exception
     {
-        DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn childDn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         Entry childEntry = new DefaultEntry( schemaManager, childDn );
         childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
         childEntry.add( "ou", "Engineering" );
@@ -764,20 +764,20 @@ public class JdbmStoreTest
 
         store.add( childEntry );
 
-        DN parentDn = new DN( "ou=Sales,o=Good Times Co.", schemaManager );
+        Dn parentDn = new Dn( "ou=Sales,o=Good Times Co.", schemaManager );
 
-        RDN rdn = new RDN( "cn=Ryan" );
+        Rdn rdn = new Rdn( "cn=Ryan" );
 
         store.moveAndRename( childDn, parentDn, rdn, childEntry, true );
 
         // to drop the alias indices
-        childDn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        childDn = new Dn( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
 
-        parentDn = new DN( "ou=Engineering,o=Good Times Co.", schemaManager );
+        parentDn = new Dn( "ou=Engineering,o=Good Times Co.", schemaManager );
 
         assertEquals( 3, store.getSubAliasIndex().count() );
 
-        DN newDn = parentDn.add( childDn.getRdn() );
+        Dn newDn = parentDn.add( childDn.getRdn() );
 
         store.move( childDn, parentDn, newDn, childEntry );
 
@@ -788,7 +788,7 @@ public class JdbmStoreTest
     @Test
     public void testModifyAdd() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, SN_AT );
@@ -818,7 +818,7 @@ public class JdbmStoreTest
     @Test
     public void testModifyReplace() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT );
@@ -849,7 +849,7 @@ public class JdbmStoreTest
     @Test
     public void testModifyRemove() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, SN_AT );
@@ -880,7 +880,7 @@ public class JdbmStoreTest
     @Test
     public void testModifyReplaceNonExistingIndexAttribute() throws Exception
     {
-        DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Tim B,ou=Sales,o=Good Times Co.", schemaManager );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "cn", "Tim B" );
@@ -938,7 +938,7 @@ public class JdbmStoreTest
         // do not add ou index this time
         store.addIndex( new JdbmIndex( SchemaConstants.UID_AT_OID ) );
 
-        DN suffixDn = new DN( "o=Good Times Co.", schemaManager );
+        Dn suffixDn = new Dn( "o=Good Times Co.", schemaManager );
         store.setSuffixDn( suffixDn );
         // init the store to call deleteUnusedIndexFiles() method
         store.init( schemaManager );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Sun Jan 23 01:17:06 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -129,7 +129,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeEmtpyServerEntry() throws Exception
     {
-        DN dn = DN.EMPTY_DN;
+        Dn dn = Dn.EMPTY_DN;
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
@@ -145,7 +145,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeDNServerEntry() throws Exception
     {
-        DN dn = new DN( "cn=text, dc=example, dc=com" );
+        Dn dn = new Dn( "cn=text, dc=example, dc=com" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -156,7 +156,7 @@ public class ServerEntrySerializerTest
 
         Entry result = ( Entry ) ses.deserialize( data );
 
-        DN newDn = new DN( dn.getRdn() );
+        Dn newDn = new Dn( dn.getRdn() );
         entry.setDn( newDn );
 
         assertEquals( entry, result );
@@ -166,7 +166,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryOC() throws Exception
     {
-        DN dn = new DN( "cn=text, dc=example, dc=com" );
+        Dn dn = new Dn( "cn=text, dc=example, dc=com" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -178,7 +178,7 @@ public class ServerEntrySerializerTest
 
         Entry result = ( Entry ) ses.deserialize( data );
 
-        DN newDn = new DN();
+        Dn newDn = new Dn();
         newDn = newDn.add( dn.getRdn() );
         entry.setDn( newDn );
 
@@ -189,7 +189,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntry() throws Exception
     {
-        DN dn = new DN( "cn=text, dc=example, dc=com" );
+        Dn dn = new Dn( "cn=text, dc=example, dc=com" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -204,7 +204,7 @@ public class ServerEntrySerializerTest
 
         Entry result = ( Entry ) ses.deserialize( data );
 
-        DN newDn = new DN();
+        Dn newDn = new Dn();
         newDn = newDn.add( dn.getRdn() );
         entry.setDn( newDn );
 
@@ -215,7 +215,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryWithEmptyDN() throws Exception
     {
-        DN dn = new DN( "" );
+        Dn dn = new Dn( "" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -237,7 +237,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryWithNoAttributes() throws Exception
     {
-        DN dn = new DN( "" );
+        Dn dn = new Dn( "" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -255,7 +255,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryWithAttributeNoValue() throws Exception
     {
-        DN dn = new DN( "" );
+        Dn dn = new Dn( "" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -276,7 +276,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryWithAttributeStringValue() throws Exception
     {
-        DN dn = new DN( "" );
+        Dn dn = new Dn( "" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );
@@ -295,7 +295,7 @@ public class ServerEntrySerializerTest
     @Test
     public void testSerializeServerEntryWithAttributeBinaryValue() throws Exception
     {
-        DN dn = new DN( "" );
+        Dn dn = new Dn( "" );
         dn.normalize( schemaManager );
 
         Entry entry = new DefaultEntry( schemaManager, dn );

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java Sun Jan 23 01:17:06 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTru
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
 import org.junit.Test;
 
@@ -48,7 +48,7 @@ public class PartitionTreeTest
         /** A structure to hold all the partitions */
         DnNode<Partition> partitionLookupTree = new DnNode<Partition>();
 
-        DN suffix = new DN( "dc=example, dc=com" );
+        Dn suffix = new Dn( "dc=example, dc=com" );
         Partition partition = new JdbmPartition();
         partition.setSuffix( suffix );
 
@@ -56,13 +56,13 @@ public class PartitionTreeTest
 
         assertNotNull( partitionLookupTree );
         assertTrue( partitionLookupTree.hasChildren() );
-        assertTrue( partitionLookupTree.contains( new RDN( "dc=com" ) ) );
+        assertTrue( partitionLookupTree.contains( new Rdn( "dc=com" ) ) );
 
-        DnNode<Partition> child = partitionLookupTree.getChild( new RDN( "dc=com" ) );
+        DnNode<Partition> child = partitionLookupTree.getChild( new Rdn( "dc=com" ) );
         assertTrue( child.hasChildren() );
-        assertTrue( child.contains( new RDN( "dc=example" ) ) );
+        assertTrue( child.contains( new Rdn( "dc=example" ) ) );
 
-        child = child.getChild( new RDN( "dc=example" ) );
+        child = child.getChild( new Rdn( "dc=example" ) );
         assertEquals( "dc=example, dc=com", child.getElement().getSuffix().getName() );
     }
 
@@ -75,13 +75,13 @@ public class PartitionTreeTest
         /** A structure to hold all the partitions */
         DnNode<Partition> partitionLookupTree = new DnNode<Partition>();
 
-        DN suffix1 = new DN( "dc=example, dc=com" );
+        Dn suffix1 = new Dn( "dc=example, dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1 );
 
         partitionLookupTree.add( suffix1, partition1 );
 
-        DN suffix2 = new DN( "ou=system" );
+        Dn suffix2 = new Dn( "ou=system" );
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2 );
 
@@ -89,18 +89,18 @@ public class PartitionTreeTest
 
         assertNotNull( partitionLookupTree );
         assertTrue( partitionLookupTree.hasChildren() );
-        assertTrue( partitionLookupTree.contains( new RDN( "ou=system" ) ) );
-        assertTrue( partitionLookupTree.contains( new RDN( "dc=com" ) ) );
+        assertTrue( partitionLookupTree.contains( new Rdn( "ou=system" ) ) );
+        assertTrue( partitionLookupTree.contains( new Rdn( "dc=com" ) ) );
 
-        DnNode<Partition> child = partitionLookupTree.getChild( new RDN( "ou=system" ) );
+        DnNode<Partition> child = partitionLookupTree.getChild( new Rdn( "ou=system" ) );
         assertTrue( child.isLeaf() );
         assertEquals( "ou=system", child.getElement().getSuffix().getName() );
 
-        child = partitionLookupTree.getChild( new RDN( "dc=com" ) );
+        child = partitionLookupTree.getChild( new Rdn( "dc=com" ) );
         assertTrue( child.hasChildren() );
-        assertTrue( child.contains( new RDN( "dc=example" ) ) );
+        assertTrue( child.contains( new Rdn( "dc=example" ) ) );
 
-        child = child.getChild( new RDN( "dc=example" ) );
+        child = child.getChild( new Rdn( "dc=example" ) );
         assertTrue( child.isLeaf() );
         assertEquals( "dc=example, dc=com", child.getElement().getSuffix().getName() );
     }
@@ -114,13 +114,13 @@ public class PartitionTreeTest
         /** A structure to hold all the partitions */
         DnNode<Partition> partitionLookupTree = new DnNode<Partition>();
 
-        DN suffix1 = new DN( "dc=example1, dc=com" );
+        Dn suffix1 = new Dn( "dc=example1, dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1 );
 
         partitionLookupTree.add( suffix1, partition1 );
 
-        DN suffix2 = new DN( "dc=example2, dc=com" );
+        Dn suffix2 = new Dn( "dc=example2, dc=com" );
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2 );
 
@@ -129,21 +129,21 @@ public class PartitionTreeTest
         assertNotNull( partitionLookupTree );
 
         assertTrue( partitionLookupTree.hasChildren() );
-        assertTrue( partitionLookupTree.contains( new RDN( "dc=com" ) ) );
+        assertTrue( partitionLookupTree.contains( new Rdn( "dc=com" ) ) );
 
-        DnNode<Partition> child = partitionLookupTree.getChild( new RDN( "dc=com" ) );
+        DnNode<Partition> child = partitionLookupTree.getChild( new Rdn( "dc=com" ) );
         assertTrue( child.hasChildren() );
 
-        child = partitionLookupTree.getChild( new RDN( "dc=com" ) );
+        child = partitionLookupTree.getChild( new Rdn( "dc=com" ) );
         assertTrue( child.hasChildren() );
-        assertTrue( child.contains( new RDN( "dc=example1" ) ) );
-        assertTrue( child.contains( new RDN( "dc=example2" ) ) );
+        assertTrue( child.contains( new Rdn( "dc=example1" ) ) );
+        assertTrue( child.contains( new Rdn( "dc=example2" ) ) );
 
-        DnNode<Partition> child1 = child.getChild( new RDN( "dc=example1" ) );
+        DnNode<Partition> child1 = child.getChild( new Rdn( "dc=example1" ) );
         assertTrue( child1.isLeaf() );
         assertEquals( "dc=example1, dc=com", child1.getElement().getSuffix().getName() );
 
-        DnNode<Partition> child2 = child.getChild( new RDN( "dc=example1" ) );
+        DnNode<Partition> child2 = child.getChild( new Rdn( "dc=example1" ) );
         assertTrue( child2.isLeaf() );
         assertEquals( "dc=example1, dc=com", child2.getElement().getSuffix().getName() );
     }

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.kerb
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -36,7 +36,7 @@ public class DirectoryPrincipalStore imp
 {
     /** The directory service backing store for this PrincipalStore. */
     private final DirectoryService directoryService;
-    private final DN searchBaseDn;
+    private final Dn searchBaseDn;
     
     
     /**
@@ -44,7 +44,7 @@ public class DirectoryPrincipalStore imp
      *
      * @param directoryService backing store for this PrincipalStore
      */
-    public DirectoryPrincipalStore( DirectoryService directoryService, DN searchBaseDn )
+    public DirectoryPrincipalStore( DirectoryService directoryService, Dn searchBaseDn )
     {
         this.directoryService = directoryService;
         this.searchBaseDn = searchBaseDn;

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosCatalog.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.proto
 
 
 /**
- * A catalog for mapping Kerberos realms to search base DN's. 
+ * A catalog for mapping Kerberos realms to search base Dn's.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Sun Jan 23 01:17:06 2011
@@ -119,7 +119,7 @@ public class PrincipalStoreEntryModifier
 
 
     /**
-     * Sets the distinguished name (DN).
+     * Sets the distinguished name (Dn).
      *
      * @param distinguishedName
      */

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.server.kerberos.shared.store.operations.ChangePassword;
 import org.apache.directory.server.kerberos.shared.store.operations.GetPrincipal;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -41,10 +41,10 @@ import org.apache.directory.shared.ldap.
 class SingleBaseSearch implements PrincipalStore
 {
     private final CoreSession session;
-    private final DN searchBaseDn;
+    private final Dn searchBaseDn;
 
 
-    SingleBaseSearch( DirectoryService directoryService, DN searchBaseDn )
+    SingleBaseSearch( DirectoryService directoryService, Dn searchBaseDn )
     {
         try
         {

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Sun Jan 23 01:17:06 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.util.Strings;
 
@@ -68,7 +68,7 @@ public class ChangePassword implements D
     }
 
 
-    public Object execute( CoreSession session, DN searchBaseDn ) throws Exception
+    public Object execute( CoreSession session, Dn searchBaseDn ) throws Exception
     {
         if ( principal == null )
         {

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.exceptions.KerberosException;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -68,9 +68,9 @@ public class GetPrincipal implements Dir
 
     /**
      * Note that the base is a relative path from the existing context.
-     * It is not a DN.
+     * It is not a Dn.
      */
-    public Object execute( CoreSession session, DN base ) throws Exception
+    public Object execute( CoreSession session, Dn base ) throws Exception
     {
         if ( principal == null )
         {

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
@@ -63,7 +63,7 @@ public class StoreUtils
      * @return the resultant server entry for the PrincipalStoreEntry argument
      * @throws Exception if there are problems accessing registries
      */
-    public static Entry toServerEntry( CoreSession session, DN dn, PrincipalStoreEntry principalEntry ) 
+    public static Entry toServerEntry( CoreSession session, Dn dn, PrincipalStoreEntry principalEntry )
         throws Exception
     {
         Entry outAttrs = session.getDirectoryService().newEntry( dn );
@@ -121,7 +121,7 @@ public class StoreUtils
      * @return the server entry for the principal or null if non-existent
      * @throws Exception if there are problems while searching the directory
      */
-    public static Entry findPrincipalEntry( CoreSession session, DN searchBaseDn, String principal ) 
+    public static Entry findPrincipalEntry( CoreSession session, Dn searchBaseDn, String principal )
         throws Exception
     {
         EntryFilteringCursor cursor = null;

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -132,7 +132,7 @@ public class LdapSSLConnectionTest exten
     {
         LdapConnection connection = new LdapNetworkConnection( sslConfig );
 
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
         connection.bind( dn.getName(), "secret" );
 
         List<String> controlList = connection.getSupportedControls();
@@ -181,7 +181,7 @@ public class LdapSSLConnectionTest exten
         connection.connect();
         connection.startTls();
 
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
         connection.bind( dn.getName(), "secret" );
 
         List<String> controlList = connection.getSupportedControls();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.message.SearchResultDone;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,7 +70,7 @@ public class ClientAbandonRequestTest ex
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
     }
 
@@ -105,7 +105,7 @@ public class ClientAbandonRequestTest ex
         for ( int i = 0; i < numEntries; i++ )
         {
             String s = String.valueOf( i );
-            DN dn = new DN( "cn=" + s + ",ou=system" );
+            Dn dn = new Dn( "cn=" + s + ",ou=system" );
             Entry entry = new DefaultEntry( dn );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
             entry.add( SchemaConstants.CN_AT, s );
@@ -116,7 +116,7 @@ public class ClientAbandonRequestTest ex
 
         SearchRequest sr = new SearchRequestImpl();
         sr.setFilter( "(cn=*)" );
-        sr.setBase( new DN( "ou=system" ) );
+        sr.setBase( new Dn( "ou=system" ) );
         sr.setScope( SearchScope.ONELEVEL );
         sr.setDerefAliases( AliasDerefMode.NEVER_DEREF_ALIASES );
 

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sun Jan 23 01:17:06 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.AddResponse;
 import org.apache.directory.shared.ldap.message.BindResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.DateUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -74,7 +74,7 @@ public class ClientAddRequestTest extend
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getSession();
@@ -104,7 +104,7 @@ public class ClientAddRequestTest extend
     @Test
     public void testAdd() throws Exception
     {
-        DN dn = new DN( "cn=testadd,ou=system" );
+        Dn dn = new Dn( "cn=testadd,ou=system" );
         Entry entry = new DefaultEntry( dn );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
         entry.add( SchemaConstants.CN_AT, "testadd_cn" );
@@ -123,7 +123,7 @@ public class ClientAddRequestTest extend
     @Test
     public void testAddAsync() throws Exception
     {
-        DN dn = new DN( "cn=testAsyncAdd,ou=system" );
+        Dn dn = new Dn( "cn=testAsyncAdd,ou=system" );
         Entry entry = new DefaultEntry( dn );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.PERSON_OC );
         entry.add( SchemaConstants.CN_AT, "testAsyncAdd_cn" );
@@ -161,7 +161,7 @@ public class ClientAddRequestTest extend
     public void testAddSystemOperationalAttributes() throws Exception
     {
         //test as admin first
-        DN dn = new DN( "cn=x,ou=system" );
+        Dn dn = new Dn( "cn=x,ou=system" );
         String uuid = UUID.randomUUID().toString();
         String csn = new CsnFactory( 0 ).newInstance().toString();
         String creator = dn.getName();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.CompareRequestImpl;
 import org.apache.directory.shared.ldap.message.CompareResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -67,7 +67,7 @@ public class ClientCompareRequestTest ex
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getSession();
@@ -97,7 +97,7 @@ public class ClientCompareRequestTest ex
     @Test
     public void testCompare() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         CompareResponse response = connection.compare( dn, SchemaConstants.UID_AT, "admin" );
         assertNotNull( response );
@@ -112,7 +112,7 @@ public class ClientCompareRequestTest ex
     @Test
     public void testCompareAsync() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         CompareRequest compareRequest = new CompareRequestImpl();
         compareRequest.setName( dn );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
 import org.apache.directory.ldap.client.api.LdapNetworkConnection;
 import org.apache.directory.ldap.client.api.future.DeleteFuture;
 import org.apache.directory.server.annotations.CreateLdapServer;
@@ -47,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
 import org.apache.directory.shared.ldap.message.DeleteResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -95,7 +94,7 @@ public class ClientDeleteRequestTest ext
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -125,7 +124,7 @@ public class ClientDeleteRequestTest ext
     @Test
     public void testDeleteLeafNode() throws Exception
     {
-        DN dn = new DN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
+        Dn dn = new Dn( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
 
         assertTrue( session.exists( dn ) );
 
@@ -140,7 +139,7 @@ public class ClientDeleteRequestTest ext
     @Test
     public void testDeleteNonLeafFailure() throws Exception
     {
-        DN dn = new DN( "cn=child1,cn=parent,ou=system" ); // has children
+        Dn dn = new Dn( "cn=child1,cn=parent,ou=system" ); // has children
         assertTrue( session.exists( dn ) );
 
         DeleteResponse response = connection.delete( dn.getName() );
@@ -155,7 +154,7 @@ public class ClientDeleteRequestTest ext
     @Ignore
     public void testDeleteWithCascadeControl() throws Exception
     {
-        DN dn = new DN( "cn=parent,ou=system" );
+        Dn dn = new Dn( "cn=parent,ou=system" );
 
         assertTrue( session.exists( dn ) );
 
@@ -185,11 +184,11 @@ public class ClientDeleteRequestTest ext
     @Ignore
     public void testDeleteWithoutCascadeControl() throws Exception
     {
-        DN dn = new DN( "cn=parent,ou=system" );
+        Dn dn = new Dn( "cn=parent,ou=system" );
 
         assertTrue( session.exists( dn ) );
 
-        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive", DN.class, Map.class );
+        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive", Dn.class, Map.class );
         deleteChildrenMethod.setAccessible( true );
 
         DeleteResponse response = ( DeleteResponse ) deleteChildrenMethod.invoke( connection, dn, null, null );
@@ -207,11 +206,11 @@ public class ClientDeleteRequestTest ext
     @Ignore
     public void testDeleteAsyncWithoutCascadeControl() throws Exception
     {
-        DN dn = new DN( "cn=parent,ou=system" );
+        Dn dn = new Dn( "cn=parent,ou=system" );
 
         assertTrue( session.exists( dn ) );
 
-        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive", DN.class, Map.class );
+        Method deleteChildrenMethod = connection.getClass().getDeclaredMethod( "deleteRecursive", Dn.class, Map.class );
         deleteChildrenMethod.setAccessible( true );
 
         final AtomicInteger count = new AtomicInteger();
@@ -231,7 +230,7 @@ public class ClientDeleteRequestTest ext
     @Test
     public void testDeleteAsync() throws Exception
     {
-        DN dn = new DN( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
+        Dn dn = new Dn( "cn=grand_child12,cn=child1,cn=parent,ou=system" );
 
         assertTrue( session.exists( dn ) );
 

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
 import org.apache.directory.shared.ldap.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -69,7 +69,7 @@ public class ClientExtendedRequestTest e
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getSession();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Sun Jan 23 01:17:06 2011
@@ -42,8 +42,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
 import org.apache.directory.shared.ldap.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -74,7 +74,7 @@ public class ClientModifyDnRequestTest e
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -106,8 +106,8 @@ public class ClientModifyDnRequestTest e
     {
         ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString" );
         assertNotNull( resp );
-        assertFalse( session.exists( new DN( dn ) ) );
-        assertTrue( session.exists( new DN( "cn=modifyDnWithString,ou=system" ) ) );
+        assertFalse( session.exists( new Dn( dn ) ) );
+        assertTrue( session.exists( new Dn( "cn=modifyDnWithString,ou=system" ) ) );
     }
 
 
@@ -117,13 +117,13 @@ public class ClientModifyDnRequestTest e
         ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString", false );
         assertNotNull( resp );
 
-        DN oldDn = new DN( dn );
+        Dn oldDn = new Dn( dn );
         assertFalse( session.exists( oldDn ) );
 
-        Entry entry = session.lookup( new DN( "cn=modifyDnWithString,ou=system" ) );
+        Entry entry = session.lookup( new Dn( "cn=modifyDnWithString,ou=system" ) );
         assertNotNull( entry );
 
-        RDN oldRdn = oldDn.getRdn();
+        Rdn oldRdn = oldDn.getRdn();
         assertTrue( entry.contains( oldRdn.getUpType(), oldRdn.getNormValue() ) );
     }
 
@@ -134,22 +134,22 @@ public class ClientModifyDnRequestTest e
         ModifyDnResponse resp = connection.move( dn, "ou=users,ou=system" );
         assertNotNull( resp );
 
-        DN oldDn = new DN( dn );
+        Dn oldDn = new Dn( dn );
         assertFalse( session.exists( oldDn ) );
 
-        assertTrue( session.exists( new DN( "cn=modDn,ou=users,ou=system" ) ) );
+        assertTrue( session.exists( new Dn( "cn=modDn,ou=users,ou=system" ) ) );
     }
 
 
     @Test
     public void testModifyDnAsync() throws Exception
     {
-        DN oldDn = new DN( dn );
-        DN newDn = new DN( "cn=modifyDnWithString,ou=system" );
+        Dn oldDn = new Dn( dn );
+        Dn newDn = new Dn( "cn=modifyDnWithString,ou=system" );
 
         ModifyDnRequest modDnReq = new ModifyDnRequestImpl();
         modDnReq.setName( oldDn );
-        modDnReq.setNewRdn( new RDN( "cn=modifyDnWithString" ) );
+        modDnReq.setNewRdn( new Rdn( "cn=modifyDnWithString" ) );
         modDnReq.setDeleteOldRdn( true );
 
         ModifyDnFuture modifyDnFuture = connection.modifyDnAsync( modDnReq );
@@ -169,6 +169,6 @@ public class ClientModifyDnRequestTest e
             fail();
         }
 
-        assertTrue( session.exists( new DN( "cn=modifyDnWithString,ou=system" ) ) );
+        assertTrue( session.exists( new Dn( "cn=modifyDnWithString,ou=system" ) ) );
     }
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sun Jan 23 01:17:06 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.message.ModifyResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.DateUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -87,7 +87,7 @@ public class ClientModifyRequestTest ext
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
 
         session = ldapServer.getDirectoryService().getAdminSession();
@@ -117,7 +117,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void testModify() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         String expected = String.valueOf( System.currentTimeMillis() );
         ModifyRequest modRequest = new ModifyRequestImpl();
@@ -137,7 +137,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void testModifyWithEntry() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         Entry entry = new DefaultEntry( dn );
 
@@ -163,7 +163,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void testModifyReplaceRemove() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         Entry entry = new DefaultEntry( dn );
 
@@ -191,7 +191,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void modifyAsync() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         String expected = String.valueOf( System.currentTimeMillis() );
         ModifyRequest modifyRequest = new ModifyRequestImpl();
@@ -230,7 +230,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void testModifyEntryUUIDAndEntryCSN() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         ModifyRequest modifyRequest = new ModifyRequestImpl();
         modifyRequest.setName( dn );
@@ -251,7 +251,7 @@ public class ClientModifyRequestTest ext
         
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
-        DN bindDn = new DN( "uid=billyd,ou=users,ou=system" );
+        Dn bindDn = new Dn( "uid=billyd,ou=users,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
         
         // non-admin user cannot modify entryCSN
@@ -266,7 +266,7 @@ public class ClientModifyRequestTest ext
     @Test
     public void testModifyModifierNameAndModifyTimestamp() throws Exception
     {
-        DN dn = new DN( "uid=admin,ou=system" );
+        Dn dn = new Dn( "uid=admin,ou=system" );
 
         String modifierName = "uid=x,ou=system";
         String modifiedTime = DateUtils.getGeneralizedTime();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.BindResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -131,7 +131,7 @@ public class SimpleBindRequestTest exten
         for ( ; i < nbLoop; i++ )
         {
             BindRequest bindRequest = new BindRequestImpl();
-            bindRequest.setName( new DN( "uid=admin,ou=system" ) );
+            bindRequest.setName( new Dn( "uid=admin,ou=system" ) );
             bindRequest.setCredentials( "secret" );
 
             BindFuture bindFuture = connection.bindAsync( bindRequest );
@@ -358,7 +358,7 @@ public class SimpleBindRequestTest exten
 
             // Send another BindRequest
             BindRequest bindRequest = new BindRequestImpl();
-            bindRequest.setName( new DN( "uid=admin,ou=system" ) );
+            bindRequest.setName( new Dn( "uid=admin,ou=system" ) );
             bindRequest.setCredentials( "secret" );
 
             BindFuture bindFuture = connection.bindAsync( bindRequest );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.message.SearchResultDone;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -91,7 +91,7 @@ public class ClientSearchRequestTest ext
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
     }
 
@@ -211,7 +211,7 @@ public class ClientSearchRequestTest ext
     public void testSearchWithDerefAlias() throws Exception
     {
         SearchRequest searchRequest = new SearchRequestImpl();
-        searchRequest.setBase( new DN( "ou=users,ou=system" ) );
+        searchRequest.setBase( new Dn( "ou=users,ou=system" ) );
         searchRequest.setFilter( "(objectClass=*)" );
         searchRequest.setScope( SearchScope.ONELEVEL );
         searchRequest.addAttributes( "*" );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Sun Jan 23 01:17:06 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -72,7 +72,7 @@ public class SearchRequestReturningAttri
     public void setup() throws Exception
     {
         connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-        DN bindDn = new DN( "uid=admin,ou=system" );
+        Dn bindDn = new Dn( "uid=admin,ou=system" );
         connection.bind( bindDn.getName(), "secret" );
     }
 
@@ -524,7 +524,7 @@ public class SearchRequestReturningAttri
     public void testSearchTypesOnly() throws Exception
     {
         SearchRequest sr = new SearchRequestImpl();
-        sr.setBase( new DN( "uid=admin,ou=system" ) );
+        sr.setBase( new Dn( "uid=admin,ou=system" ) );
         sr.setFilter( "(uid=admin)" );
         sr.setScope( SearchScope.OBJECT );
         sr.setTypesOnly( true );

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/AbstractLdifPartition.java Sun Jan 23 01:17:06 2011
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -146,7 +146,7 @@ public abstract class AbstractLdifPartit
      * {@inheritDoc}
      */
     @Override
-    public DN getEntryDn( Long id ) throws Exception
+    public Dn getEntryDn( Long id ) throws Exception
     {
         return wrappedPartition.getEntryDn( id );
     }
@@ -156,7 +156,7 @@ public abstract class AbstractLdifPartit
      * {@inheritDoc}
      */
     @Override
-    public Long getEntryId( DN dn ) throws LdapException
+    public Long getEntryId( Dn dn ) throws LdapException
     {
         return wrappedPartition.getEntryId( dn );
     }
@@ -373,7 +373,7 @@ public abstract class AbstractLdifPartit
      * {@inheritDoc}
      */
     @Override
-    public void setSuffix( DN suffix ) throws LdapInvalidDnException
+    public void setSuffix( Dn suffix ) throws LdapInvalidDnException
     {
         super.setSuffix( suffix );
         wrappedPartition.setSuffix( suffix );



Mime
View raw message