directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [13/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/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Sun Jan 23 01:17:06 2011
@@ -49,9 +49,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Ava;
+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.util.Strings;
 import org.slf4j.Logger;
@@ -295,7 +295,7 @@ public class LdifPartition extends Abstr
         modifyContext.setAlteredEntry( modifiedEntry );
 
         // just overwrite the existing file
-        DN dn = modifyContext.getDn();
+        Dn dn = modifyContext.getDn();
 
         // And write it back on disk
         try
@@ -317,7 +317,7 @@ public class LdifPartition extends Abstr
     @Override
     public void move( MoveOperationContext moveContext ) throws LdapException
     {
-        DN oldDn = moveContext.getDn();
+        Dn oldDn = moveContext.getDn();
         Long id = getEntryId( oldDn );
 
         wrappedPartition.move( moveContext );
@@ -335,7 +335,7 @@ public class LdifPartition extends Abstr
     @Override
     public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
     {
-        DN oldDn = moveAndRenameContext.getDn();
+        Dn oldDn = moveAndRenameContext.getDn();
         Long id = getEntryId( oldDn );
 
         wrappedPartition.moveAndRename( moveAndRenameContext );
@@ -354,7 +354,7 @@ public class LdifPartition extends Abstr
     @Override
     public void rename( RenameOperationContext renameContext ) throws LdapException
     {
-        DN oldDn = renameContext.getDn();
+        Dn oldDn = renameContext.getDn();
         Long id = getEntryId( oldDn );
 
         // Create the new entry
@@ -375,12 +375,12 @@ public class LdifPartition extends Abstr
      * Note that instead of moving and updating the existing files on disk
      * this method gets the moved entry and its children and writes the LDIF files
      *
-     * @param oldEntryDn the moved entry's old DN
+     * @param oldEntryDn the moved entry's old Dn
      * @param entryId the moved entry's master table ID
      * @param deleteOldEntry a flag to tell whether to delete the old entry files
      * @throws Exception
      */
-    private void entryMoved( DN oldEntryDn, Entry modifiedEntry, Long entryIdOld ) throws LdapException
+    private void entryMoved( Dn oldEntryDn, Entry modifiedEntry, Long entryIdOld ) throws LdapException
     {
         // First, add the new entry
         add( modifiedEntry );
@@ -498,14 +498,14 @@ public class LdifPartition extends Abstr
 
 
     /**
-     * Create the file name from the entry DN.
+     * Create the file name from the entry Dn.
      */
-    private File getFile( DN entryDn, boolean create ) throws LdapException
+    private File getFile( Dn entryDn, boolean create ) throws LdapException
     {
         StringBuilder filePath = new StringBuilder();
         filePath.append( suffixDirectory ).append( File.separator );
 
-        DN baseDn = entryDn.getSuffix( suffix.size() );
+        Dn baseDn = entryDn.getSuffix( suffix.size() );
 
         for ( int i = 0; i < baseDn.size() - 1; i++ )
         {
@@ -548,19 +548,19 @@ public class LdifPartition extends Abstr
 
 
     /**
-     * Compute the real name based on the RDN, assuming that depending on the underlying
+     * Compute the real name based on the Rdn, assuming that depending on the underlying
      * OS, some characters are not allowed.
      *
      * We don't allow filename which length is > 255 chars.
      */
-    private String getFileName( RDN rdn ) throws LdapException
+    private String getFileName( Rdn rdn ) throws LdapException
     {
         StringBuilder fileName = new StringBuilder( "" );
 
-        Iterator<AVA> iterator = rdn.iterator();
+        Iterator<Ava> iterator = rdn.iterator();
         while ( iterator.hasNext() )
         {
-            AVA ava = iterator.next();
+            Ava ava = iterator.next();
 
             // First, get the AT name, or OID
             String normAT = ava.getNormType();
@@ -584,17 +584,17 @@ public class LdifPartition extends Abstr
 
 
     /**
-     * Compute the real name based on the DN, assuming that depending on the underlying
+     * Compute the real name based on the Dn, assuming that depending on the underlying
      * OS, some characters are not allowed.
      *
      * We don't allow filename which length is > 255 chars.
      */
-    private String getFileName( DN dn ) throws LdapException
+    private String getFileName( Dn dn ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
         boolean isFirst = true;
 
-        for ( RDN rdn : dn.getRdns() )
+        for ( Rdn rdn : dn.getRdns() )
         {
             // First, get the AT name, or OID
             String normAT = rdn.getAVA().getNormType();

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Sun Jan 23 01:17:06 2011
@@ -350,7 +350,7 @@ public class SingleFileLdifPartition ext
                 cursorMap.put( entryId, cursor );
             }
 
-            if ( !cursor.next() ) // if this is a leaf entry's DN
+            if ( !cursor.next() ) // if this is a leaf entry's Dn
             {
                 cursorMap.remove( entryId );
                 cursor.close();

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java Sun Jan 23 01:17:06 2011
@@ -56,9 +56,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
-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.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -140,7 +140,7 @@ public class LdifPartitionTest
         partition = new LdifPartition();
         partition.setCheckHasEntryDuringAdd( true );
         partition.setId( "test-ldif" );
-        partition.setSuffix( new DN( "ou=test,ou=system" ) );
+        partition.setSuffix( new Dn( "ou=test,ou=system" ) );
         partition.setSchemaManager( schemaManager );
         partition.setPartitionPath( wkdir.toURI() );
 
@@ -154,7 +154,7 @@ public class LdifPartitionTest
     private ClonedServerEntry createEntry( String dn ) throws Exception
     {
         Entry entry = new DefaultEntry( schemaManager );
-        entry.setDn( new DN( dn, schemaManager ) );
+        entry.setDn( new Dn( dn, schemaManager ) );
         entry.put( SchemaConstants.ENTRY_CSN_AT, defaultCSNFactory.newInstance().toString() );
         entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
 
@@ -175,7 +175,7 @@ public class LdifPartitionTest
     @Test
     public void testLdifAddEntries() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -220,7 +220,7 @@ public class LdifPartitionTest
     @Test
     public void testLdifAddExistingEntry() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -274,7 +274,7 @@ public class LdifPartitionTest
     @Test
     public void testLdifDeleteExistingEntry() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -309,7 +309,7 @@ public class LdifPartitionTest
 
         DeleteOperationContext delCtx = new DeleteOperationContext( session );
 
-        DN dn = new DN( "dc=test1,dc=test,ou=test,ou=system", schemaManager );
+        Dn dn = new Dn( "dc=test1,dc=test,ou=test,ou=system", schemaManager );
 
         delCtx.setDn( dn );
 
@@ -326,13 +326,13 @@ public class LdifPartitionTest
         assertFalse( new File( wkdir, "ou=test,ou=system/dc=test/dc=mvrdn%2bobjectclass=domain" ).exists() );
         assertTrue( new File( wkdir, "ou=test,ou=system/dc=test/dc=mvrdn%2bobjectclass=domain.ldif" ).exists() );
 
-        dn = new DN( "dc=test2,dc=test,ou=test,ou=system", schemaManager );
+        dn = new Dn( "dc=test2,dc=test,ou=test,ou=system", schemaManager );
 
         delCtx.setDn( dn );
 
         partition.delete( delCtx );
 
-        dn = new DN( "dc=mvrdn+objectClass=domain,dc=test,ou=test,ou=system", schemaManager );
+        dn = new Dn( "dc=mvrdn+objectClass=domain,dc=test,ou=test,ou=system", schemaManager );
 
         delCtx.setDn( dn );
 
@@ -360,7 +360,7 @@ public class LdifPartitionTest
     @Test
     public void testLdifSearchExistingEntry() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -388,7 +388,7 @@ public class LdifPartitionTest
 
         SearchOperationContext searchCtx = new SearchOperationContext( session );
 
-        DN dn = new DN( "dc=test,ou=test,ou=system" );
+        Dn dn = new Dn( "dc=test,ou=test,ou=system" );
         dn.normalize( schemaManager );
         searchCtx.setDn( dn );
         ExprNode filter = FilterParser.parse( schemaManager, "(ObjectClass=domain)" );
@@ -429,9 +429,9 @@ public class LdifPartitionTest
     {
         CoreSession session = injectEntries();
 
-        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new DN( "dc=child1,ou=test,ou=system",
+        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new Dn( "dc=child1,ou=test,ou=system",
             schemaManager ) ) );
-        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new DN( "dc=child2,ou=test,ou=system",
+        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new Dn( "dc=child2,ou=test,ou=system",
             schemaManager ) ) );
 
         MoveOperationContext moveOpCtx = new MoveOperationContext( session, childEntry1.getDn(), childEntry2.getDn() );
@@ -459,9 +459,9 @@ public class LdifPartitionTest
     {
         CoreSession session = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "renamedChild1" );
         RenameOperationContext renameOpCtx = new RenameOperationContext( session, childDn1, newRdn, true );
         partition.rename( renameOpCtx );
 
@@ -486,9 +486,9 @@ public class LdifPartitionTest
     {
         CoreSession session = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "renamedChild1" );
         RenameOperationContext renameOpCtx = new RenameOperationContext( session, childDn1, newRdn, false );
         partition.rename( renameOpCtx );
 
@@ -506,7 +506,7 @@ public class LdifPartitionTest
         assertTrue( new File( wkdir, "ou=test,ou=system/dc=renamedchild1/dc=grandchild11/dc=greatgrandchild111.ldif" )
             .exists() );
 
-        // the renamed LDIF must contain the old an new RDN attribute
+        // the renamed LDIF must contain the old an new Rdn attribute
         String content = FileUtils.readFileToString( new File( wkdir, "ou=test,ou=system/dc=renamedchild1.ldif" ) );
         assertTrue( content.contains( "dc: child1" ) );
         assertTrue( content.contains( "dc: renamedChild1" ) );
@@ -518,11 +518,11 @@ public class LdifPartitionTest
     {
         CoreSession session = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        DN childDn2 = new DN( "dc=child2,ou=test,ou=system", schemaManager );
+        Dn childDn2 = new Dn( "dc=child2,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "movedChild1" );
         MoveAndRenameOperationContext moveAndRenameOpCtx = new MoveAndRenameOperationContext( session, childDn1,
             childDn2, newRdn, true );
         partition.moveAndRename( moveAndRenameOpCtx );
@@ -548,11 +548,11 @@ public class LdifPartitionTest
     {
         CoreSession session = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        DN childDn2 = new DN( "dc=child2,ou=test,ou=system", schemaManager );
+        Dn childDn2 = new Dn( "dc=child2,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "movedChild1" );
         MoveAndRenameOperationContext moveAndRenameOpCtx = new MoveAndRenameOperationContext( session, childDn1,
             childDn2, newRdn, false );
         partition.moveAndRename( moveAndRenameOpCtx );
@@ -571,7 +571,7 @@ public class LdifPartitionTest
         assertTrue( new File( wkdir,
             "ou=test,ou=system/dc=child2/dc=movedchild1/dc=grandchild11/dc=greatgrandchild111.ldif" ).exists() );
 
-        // the renamed LDIF must contain the old an new RDN attribute
+        // the renamed LDIF must contain the old an new Rdn attribute
         String content = FileUtils
             .readFileToString( new File( wkdir, "ou=test,ou=system/dc=child2/dc=movedchild1.ldif" ) );
         assertTrue( content.contains( "dc: child1" ) );
@@ -586,7 +586,7 @@ public class LdifPartitionTest
     @Test
     public void testSpecialCharacters() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -614,7 +614,7 @@ public class LdifPartitionTest
     @Test
     public void testControlCharacters() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
@@ -645,7 +645,7 @@ public class LdifPartitionTest
 
     private CoreSession injectEntries() throws Exception
     {
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );

Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/SingleFileLdifPartitionTest.java Sun Jan 23 01:17:06 2011
@@ -69,9 +69,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
-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.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -139,7 +139,7 @@ public class SingleFileLdifPartitionTest
 
         defaultCSNFactory = new CsnFactory( 0 );
 
-        DN adminDn = new DN( "uid=admin,ou=system", schemaManager );
+        Dn adminDn = new Dn( "uid=admin,ou=system", schemaManager );
         mockSession = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ),
             new MockDirectoryService( 1 ) );
 
@@ -167,7 +167,7 @@ public class SingleFileLdifPartitionTest
     private ClonedServerEntry createEntry( String dn ) throws Exception
     {
         Entry entry = new DefaultEntry( schemaManager );
-        entry.setDn( new DN( dn, schemaManager ) );
+        entry.setDn( new Dn( dn, schemaManager ) );
         entry.put( SchemaConstants.ENTRY_CSN_AT, defaultCSNFactory.newInstance().toString() );
         entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
 
@@ -214,7 +214,7 @@ public class SingleFileLdifPartitionTest
         partition.setCheckHasEntryDuringAdd( true );
         partition.setId( "test-ldif" );
         partition.setPartitionPath( new File( fileName ).toURI() );
-        partition.setSuffix( new DN( "ou=test,ou=system" ) );
+        partition.setSuffix( new Dn( "ou=test,ou=system" ) );
         partition.setSchemaManager( schemaManager );
         partition.initialize();
 
@@ -243,7 +243,7 @@ public class SingleFileLdifPartitionTest
     private void assertExists( SingleFileLdifPartition partition, String dn ) throws LdapException
     {
         LookupOperationContext opCtx = new LookupOperationContext( mockSession );
-        opCtx.setDn( new DN( dn ) );
+        opCtx.setDn( new Dn( dn ) );
 
         Entry fetched = partition.lookup( opCtx );
 
@@ -642,7 +642,7 @@ public class SingleFileLdifPartitionTest
 
         SearchOperationContext searchCtx = new SearchOperationContext( mockSession );
 
-        DN dn = new DN( "dc=test,ou=test,ou=system" );
+        Dn dn = new Dn( "dc=test,ou=test,ou=system" );
         dn.normalize( schemaManager );
         searchCtx.setDn( dn );
         ExprNode filter = FilterParser.parse( schemaManager, "(ObjectClass=domain)" );
@@ -683,9 +683,9 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new DN( "dc=child1,ou=test,ou=system",
+        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new Dn( "dc=child1,ou=test,ou=system",
             schemaManager ) ) );
-        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new DN( "dc=child2,ou=test,ou=system",
+        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new Dn( "dc=child2,ou=test,ou=system",
             schemaManager ) ) );
 
         MoveOperationContext moveOpCtx = new MoveOperationContext( mockSession, childEntry1.getDn(),
@@ -708,9 +708,9 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new DN( "dc=grandChild11,dc=child1,ou=test,ou=system",
+        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new Dn( "dc=grandChild11,dc=child1,ou=test,ou=system",
             schemaManager ) ) );
-        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new DN( "dc=child2,ou=test,ou=system",
+        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new Dn( "dc=child2,ou=test,ou=system",
             schemaManager ) ) );
 
         MoveOperationContext moveOpCtx = new MoveOperationContext( mockSession, childEntry1.getDn(),
@@ -734,15 +734,15 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "renamedChild1" );
         RenameOperationContext renameOpCtx = new RenameOperationContext( mockSession, childDn1, newRdn, true );
         partition.rename( renameOpCtx );
 
         partition = reloadPartition();
 
-        childDn1 = new DN( "dc=renamedChild1,ou=test,ou=system", schemaManager );
+        childDn1 = new Dn( "dc=renamedChild1,ou=test,ou=system", schemaManager );
 
         Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) );
 
@@ -756,15 +756,15 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "renamedChild1" );
         RenameOperationContext renameOpCtx = new RenameOperationContext( mockSession, childDn1, newRdn, false );
         partition.rename( renameOpCtx );
 
         partition = reloadPartition();
 
-        childDn1 = new DN( "dc=renamedChild1,ou=test,ou=system", schemaManager );
+        childDn1 = new Dn( "dc=renamedChild1,ou=test,ou=system", schemaManager );
 
         Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) );
 
@@ -778,18 +778,18 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        DN childDn2 = new DN( "dc=child2,ou=test,ou=system", schemaManager );
+        Dn childDn2 = new Dn( "dc=child2,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "movedChild1" );
         MoveAndRenameOperationContext moveAndRenameOpCtx = new MoveAndRenameOperationContext( mockSession, childDn1,
             childDn2, newRdn, true );
         partition.moveAndRename( moveAndRenameOpCtx );
 
         partition = reloadPartition();
 
-        childDn1 = new DN( "dc=movedChild1,dc=child2,ou=test,ou=system", schemaManager );
+        childDn1 = new Dn( "dc=movedChild1,dc=child2,ou=test,ou=system", schemaManager );
 
         Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) );
 
@@ -805,18 +805,18 @@ public class SingleFileLdifPartitionTest
     {
         SingleFileLdifPartition partition = injectEntries();
 
-        DN childDn1 = new DN( "dc=child1,ou=test,ou=system", schemaManager );
+        Dn childDn1 = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
 
-        DN childDn2 = new DN( "dc=child2,ou=test,ou=system", schemaManager );
+        Dn childDn2 = new Dn( "dc=child2,ou=test,ou=system", schemaManager );
 
-        RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
+        Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "movedChild1" );
         MoveAndRenameOperationContext moveAndRenameOpCtx = new MoveAndRenameOperationContext( mockSession, childDn1,
             childDn2, newRdn, false );
         partition.moveAndRename( moveAndRenameOpCtx );
 
         partition = reloadPartition();
 
-        childDn1 = new DN( "dc=movedChild1,dc=child2,ou=test,ou=system", schemaManager );
+        childDn1 = new Dn( "dc=movedChild1,dc=child2,ou=test,ou=system", schemaManager );
 
         Entry entry = partition.lookup( new LookupOperationContext( mockSession, childDn1 ) );
 
@@ -895,7 +895,7 @@ public class SingleFileLdifPartitionTest
 
         // test the work of modify thread
         LookupOperationContext lookupCtx = new LookupOperationContext( mockSession );
-        lookupCtx.setDn( new DN( "dc=threadDoModify,ou=test,ou=system" ) );
+        lookupCtx.setDn( new Dn( "dc=threadDoModify,ou=test,ou=system" ) );
 
         Entry entry = partition.lookup( lookupCtx );
         assertNotNull( entry );
@@ -1017,7 +1017,7 @@ public class SingleFileLdifPartitionTest
 
     /**
      * performs rename operation on an entry 1000 times, at the end of the
-     * last iteration the original entry should remain with the old DN it has
+     * last iteration the original entry should remain with the old Dn it has
      * before starting this method
      */
     private Runnable getRenameTask( final SingleFileLdifPartition partition )
@@ -1030,14 +1030,14 @@ public class SingleFileLdifPartitionTest
                 
                 try
                 {
-                    DN dn = new DN( "dc=grandChild12,dc=child1,ou=test,ou=system", schemaManager );
+                    Dn dn = new Dn( "dc=grandChild12,dc=child1,ou=test,ou=system", schemaManager );
 
-                    RDN oldRdn = new RDN( SchemaConstants.DC_AT + "=" + "grandChild12" );
+                    Rdn oldRdn = new Rdn( SchemaConstants.DC_AT + "=" + "grandChild12" );
 
-                    RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedGrandChild12" );
+                    Rdn newRdn = new Rdn( SchemaConstants.DC_AT + "=" + "renamedGrandChild12" );
 
-                    DN tmpDn = dn;
-                    RDN tmpRdn = newRdn;
+                    Dn tmpDn = dn;
+                    Rdn tmpRdn = newRdn;
 
                     for ( ; i < 500; i++ )
                     {
@@ -1086,13 +1086,13 @@ public class SingleFileLdifPartitionTest
                 
                 try
                 {
-                    DN originalDn = new DN( "dc=grandChild11,dc=child1,ou=test,ou=system", schemaManager );
+                    Dn originalDn = new Dn( "dc=grandChild11,dc=child1,ou=test,ou=system", schemaManager );
 
-                    DN originalParent = new DN( "dc=child1,ou=test,ou=system", schemaManager );
-                    DN newParent = new DN( "dc=child2,ou=test,ou=system", schemaManager );
+                    Dn originalParent = new Dn( "dc=child1,ou=test,ou=system", schemaManager );
+                    Dn newParent = new Dn( "dc=child2,ou=test,ou=system", schemaManager );
 
-                    DN tmpDn = originalDn;
-                    DN tmpParentDn = newParent;
+                    Dn tmpDn = originalDn;
+                    Dn tmpParentDn = newParent;
 
                     for ( ; i < 500; i++ )
                     {

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

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ public interface DnsOperation extends Se
      * The command pattern execute method.
      * 
      * @param ctx The context to execute the command with
-     * @param baseDn The base DN for working with the context
+     * @param baseDn The base Dn for working with the context
      * @return Set<ResourceRecord> The result returned by the command
      * @throws Exception The exception thrown by the command
      */

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/JndiRecordStoreImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/JndiRecordStoreImpl.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/JndiRecordStoreImpl.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/JndiRecordStoreImpl.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.server.dns.s
 
 /**
  * A DirectoryService-backed implementation of the RecordStore interface.  This RecordStore uses
- * the Strategy pattern to either serve records based on a single base DN or to lookup
+ * the Strategy pattern to either serve records based on a single base Dn or to lookup
  * catalog mappings from directory configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SearchStrategy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SearchStrategy.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SearchStrategy.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SearchStrategy.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.dns.m
 
 /**
  * Interface for search strategies.  The DNS protocol may search a single
- * base DN for resource records or use a catalog to lookup resource records
+ * base Dn for resource records or use a catalog to lookup resource records
  * in multiple zones.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java Sun Jan 23 01:17:06 2011
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A JNDI-backed search strategy implementation.  This search strategy searches a
- * single base DN for resource records.
+ * single base Dn for resource records.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java Sun Jan 23 01:17:06 2011
@@ -68,7 +68,7 @@ public class GetFlatRecord implements Dn
 
     /**
      * Note that the base is a relative path from the exiting context.
-     * It is not a DN.
+     * It is not a Dn.
      */
     public Set<ResourceRecord> execute( DirContext ctx, Name base ) throws Exception
     {

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java Sun Jan 23 01:17:06 2011
@@ -117,7 +117,7 @@ public class GetRecords implements DnsOp
 
     /**
      * Note that the base is a relative path from the exiting context.
-     * It is not a DN.
+     * It is not a Dn.
      */
     public Set<ResourceRecord> execute( DirContext ctx, Name base ) throws Exception
     {

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.server.proto
 import org.apache.directory.server.protocol.shared.transport.UdpTransport;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 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.mina.core.filterchain.DefaultIoFilterChainBuilder;
 import org.apache.mina.core.filterchain.IoFilterChainBuilder;
 import org.apache.mina.core.service.IoAcceptor;
@@ -451,7 +451,7 @@ public class KdcServer extends Directory
         PrincipalStore store;
 
         // TODO - for now ignoring this catalog crap
-        store = new DirectoryPrincipalStore( getDirectoryService(), new DN(this.getSearchBaseDn())  );
+        store = new DirectoryPrincipalStore( getDirectoryService(), new Dn(this.getSearchBaseDn())  );
         
         LOG.debug( "initializing the kerberos replay cache" );
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Sun Jan 23 01:17:06 2011
@@ -46,7 +46,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.apache.directory.shared.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
@@ -107,7 +107,7 @@ public class BindHandler extends LdapReq
         // any context yet.
         BindOperationContext bindContext = new BindOperationContext( null );
 
-        // Stores the DN of the user to check, and its password
+        // Stores the Dn of the user to check, and its password
         bindContext.setDn( bindRequest.getName() );
         bindContext.setCredentials( bindRequest.getCredentials() );
 
@@ -121,7 +121,7 @@ public class BindHandler extends LdapReq
              *    
              *      http://www.faqs.org/rfcs/rfc3296.html
              *      
-             * See section 5.6.1 where if the bind principal DN is a referral 
+             * See section 5.6.1 where if the bind principal Dn is a referral
              * we return an invalidCredentials result response.  Optionally we
              * could support delegated authentication in the future with this
              * potential.  See the following JIRA for more on this possibility:
@@ -130,7 +130,7 @@ public class BindHandler extends LdapReq
              *      
              * NOTE: if this is done then this handler should extend the 
              * a modified form of the ReferralAwareRequestHandler so it can 
-             * detect conditions where ancestors of the DN are referrals
+             * detect conditions where ancestors of the Dn are referrals
              * and delegate appropriately.
              */
             Entry principalEntry = null;
@@ -218,7 +218,7 @@ public class BindHandler extends LdapReq
                 msg += "\n\nBindRequest = \n" + bindRequest.toString();
             }
 
-            DN dn = null;
+            Dn dn = null;
 
             if ( e instanceof LdapAuthenticationException )
             {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.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.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.ResultResponse;
 import org.apache.directory.shared.ldap.message.ResultResponseRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.handler.demux.MessageHandler;
@@ -283,7 +283,7 @@ public abstract class LdapRequestHandler
 
             if ( ( ne.getResolvedDn() != null ) && setMatchedDn )
             {
-                result.setMatchedDn( ( DN ) ne.getResolvedDn() );
+                result.setMatchedDn( (Dn) ne.getResolvedDn() );
             }
 
             // Add the referrals if necessary

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 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.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,12 +46,12 @@ public class ModifyDnHandler extends Lda
      *
      * A ModifyDN operation has more than one semantic, depending on its parameters.
      *
-     * In any case, the first argument is the DN entry to be changed. We then
-     * have the new relative DN for this entry.
+     * In any case, the first argument is the Dn entry to be changed. We then
+     * have the new relative Dn for this entry.
      *
      * Two other arguments can be provided :
-     * - deleteOldRdn : if the old RDN attributes should be removed from the
-     * new entry or not (for instance, if the old RDN was cn=acme, and the new
+     * - deleteOldRdn : if the old Rdn attributes should be removed from the
+     * new entry or not (for instance, if the old Rdn was cn=acme, and the new
      * one is sn=acme, then we may have to remove the cn: acme from the attributes
      * list)
      * - newSuperior : this is a move operation. The entry is removed from its
@@ -65,7 +65,7 @@ public class ModifyDnHandler extends Lda
         if ( req.getName().isEmpty() )
         {
             // it is not allowed to modify the name of the Root DSE
-            String msg = "Modify DN is not allowed on Root DSE.";
+            String msg = "Modify Dn is not allowed on Root DSE.";
             result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( msg );
             session.getIoSession().write( req.getResultResponse() );
@@ -75,9 +75,9 @@ public class ModifyDnHandler extends Lda
         try
         {
             SchemaManager schemaManager = session.getCoreSession().getDirectoryService().getSchemaManager();
-            DN newRdn = new DN( req.getNewRdn().getName(), schemaManager );
+            Dn newRdn = new Dn( req.getNewRdn().getName(), schemaManager );
             
-            DN oldRdn = new DN( req.getName().getRdn().getName(), schemaManager );
+            Dn oldRdn = new Dn( req.getName().getRdn().getName(), schemaManager );
             
             boolean rdnChanged = req.getNewRdn() != null && 
                 ! newRdn.getNormName().equals( oldRdn.getNormName() );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sun Jan 23 01:17:06 2011
@@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 import org.apache.directory.shared.ldap.message.SearchResultReference;
 import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
-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.filter.LdapURL;
 import org.apache.directory.shared.util.Strings;
@@ -1086,7 +1086,7 @@ public class SearchHandler extends LdapR
         boolean isparentReferral = false;
         DirectoryService directoryService = session.getCoreSession().getDirectoryService();
         ReferralManager referralManager = directoryService.getReferralManager();
-        DN reqTargetDn = req.getBase();
+        Dn reqTargetDn = req.getBase();
 
         reqTargetDn.normalize( directoryService.getSchemaManager() );
 
@@ -1241,7 +1241,7 @@ public class SearchHandler extends LdapR
                 continue;
             }
 
-            // parse the ref value and normalize the DN
+            // parse the ref value and normalize the Dn
             LdapURL ldapUrl = new LdapURL();
             try
             {
@@ -1267,7 +1267,7 @@ public class SearchHandler extends LdapR
      * Determines if a search request is on the RootDSE of the server.
      *
      * It is a RootDSE search if :
-     * - the base DN is empty
+     * - the base Dn is empty
      * - and the scope is BASE OBJECT
      * - and the filter is (ObjectClass = *)
      *
@@ -1309,7 +1309,7 @@ public class SearchHandler extends LdapR
      * </p>
      * <p>
      * It is a schema search if:
-     * - the base DN is the DN of the subSchemaSubEntry of the root DSE
+     * - the base Dn is the Dn of the subSchemaSubEntry of the root DSE
      * - and the scope is BASE OBJECT
      * - and the filter is (objectClass=subschema)
      * (RFC 4512, 4.4,)
@@ -1328,13 +1328,13 @@ public class SearchHandler extends LdapR
      */
     private boolean isSubSchemaSubEntrySearch( LdapSession session, SearchRequest req ) throws Exception
     {
-        DN base = req.getBase();
+        Dn base = req.getBase();
         String baseNormForm = ( base.isNormalized() ? base.getNormName() : base.getNormName() );
 
         DirectoryService ds = session.getCoreSession().getDirectoryService();
         PartitionNexus nexus = ds.getPartitionNexus();
         Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
-        DN subschemaSubentryDn = new DN( subschemaSubentry.getString(), ds.getSchemaManager() );
+        Dn subschemaSubentryDn = new Dn( subschemaSubentry.getString(), ds.getSchemaManager() );
         String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
 
         return subschemaSubentryDnNorm.equals( baseNormForm );
@@ -1381,8 +1381,8 @@ public class SearchHandler extends LdapR
                 LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
 
-            // Normalize the DN to check for same dn
-            DN urlDn = new DN( ldapUrl.getDn().getName(), session.getCoreSession().getDirectoryService()
+            // Normalize the Dn to check for same dn
+            Dn urlDn = new Dn( ldapUrl.getDn().getName(), session.getCoreSession().getDirectoryService()
                 .getSchemaManager() );
 
             if ( urlDn.getNormName().equals( req.getBase().getNormName() ) )
@@ -1395,16 +1395,16 @@ public class SearchHandler extends LdapR
             }
 
             /*
-             * If we get here then the DN of the referral was not the same as the
-             * DN of the ref LDAP URL.  We must calculate the remaining (difference)
-             * name past the farthest referral DN which the target name extends.
+             * If we get here then the Dn of the referral was not the same as the
+             * Dn of the ref LDAP URL.  We must calculate the remaining (difference)
+             * name past the farthest referral Dn which the target name extends.
              */
             int diff = req.getBase().size() - referralAncestor.getDn().size();
-            DN extra = new DN();
+            Dn extra = new Dn();
 
-            // TODO - fix this by access unormalized RDN values
+            // TODO - fix this by access unormalized Rdn values
             // seems we have to do this because get returns normalized rdns
-            DN reqUnnormalizedDn = new DN( req.getBase().getName() );
+            Dn reqUnnormalizedDn = new Dn( req.getBase().getName() );
             for ( int jj = 0; jj < diff; jj++ )
             {
                 extra = extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
@@ -1430,7 +1430,7 @@ public class SearchHandler extends LdapR
      * @param referralAncestor the farthest referral ancestor of the missing
      * entry
      */
-    public Referral getReferralOnAncestor( LdapSession session, DN reqTargetDn, SearchRequest req,
+    public Referral getReferralOnAncestor( LdapSession session, Dn reqTargetDn, SearchRequest req,
         ClonedServerEntry referralAncestor ) throws Exception
     {
         LOG.debug( "Inside getReferralOnAncestor()" );
@@ -1451,7 +1451,7 @@ public class SearchHandler extends LdapR
                 continue;
             }
 
-            // parse the ref value and normalize the DN
+            // parse the ref value and normalize the Dn
             LdapURL ldapUrl = new LdapURL();
             try
             {
@@ -1462,7 +1462,7 @@ public class SearchHandler extends LdapR
                 LOG.error( I18n.err( I18n.ERR_165, ref, referralAncestor ) );
             }
 
-            DN urlDn = new DN( ldapUrl.getDn().getName(), session.getCoreSession().getDirectoryService()
+            Dn urlDn = new Dn( ldapUrl.getDn().getName(), session.getCoreSession().getDirectoryService()
                 .getSchemaManager() );
 
             if ( urlDn.getNormName().equals( referralAncestor.getDn().getNormName() ) )
@@ -1483,16 +1483,16 @@ public class SearchHandler extends LdapR
             }
 
             /*
-             * If we get here then the DN of the referral was not the same as the
-             * DN of the ref LDAP URL.  We must calculate the remaining (difference)
-             * name past the farthest referral DN which the target name extends.
+             * If we get here then the Dn of the referral was not the same as the
+             * Dn of the ref LDAP URL.  We must calculate the remaining (difference)
+             * name past the farthest referral Dn which the target name extends.
              */
             int diff = reqTargetDn.size() - referralAncestor.getDn().size();
-            DN extra = new DN();
+            Dn extra = new Dn();
 
-            // TODO - fix this by access unormalized RDN values
+            // TODO - fix this by access unormalized Rdn values
             // seems we have to do this because get returns normalized rdns
-            DN reqUnnormalizedDn = new DN( reqTargetDn.getName() );
+            Dn reqUnnormalizedDn = new Dn( reqTargetDn.getName() );
             for ( int jj = 0; jj < diff; jj++ )
             {
                 extra = extra.add( reqUnnormalizedDn.get( referralAncestor.getDn().size() + jj ) );
@@ -1576,7 +1576,7 @@ public class SearchHandler extends LdapR
 
 
     /**
-     * Searches up the ancestry of a DN searching for the farthest referral
+     * Searches up the ancestry of a Dn searching for the farthest referral
      * ancestor.  This is required to properly handle referrals.  Note that
      * this function is quite costly since it attempts to lookup all the
      * ancestors up the hierarchy just to see if they represent referrals.
@@ -1588,11 +1588,11 @@ public class SearchHandler extends LdapR
      */
     // This will suppress PMD.EmptyCatchBlock warnings in this method
     @SuppressWarnings("PMD.EmptyCatchBlock")
-    public static final Entry getFarthestReferralAncestor( LdapSession session, DN target ) throws Exception
+    public static final Entry getFarthestReferralAncestor( LdapSession session, Dn target ) throws Exception
     {
         Entry entry;
         Entry farthestReferralAncestor = null;
-        DN dn = target;
+        Dn dn = target;
 
         try
         {
@@ -1625,7 +1625,7 @@ public class SearchHandler extends LdapR
             {
                 LOG.debug( "Entry for {} not found.", dn );
 
-                // update the DN as we strip last component
+                // update the Dn as we strip last component
                 try
                 {
                     dn = dn.remove( dn.size() - 1 );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.session.IoSession;
@@ -136,7 +136,7 @@ public abstract class AbstractSaslCallba
      * Final check to authorize user.  Used by all SASL mechanisms.  This
      * is the only callback used by GSSAPI.
      * 
-     * Implementors use setAuthorizedID() to set the base DN after canonicalization.
+     * Implementors use setAuthorizedID() to set the base Dn after canonicalization.
      * Implementors must setAuthorized() to <code>true</code> if authentication was successful.
      * 
      * @param callback An {@link AuthorizeCallback}.
@@ -245,7 +245,7 @@ public abstract class AbstractSaslCallba
         catch ( Exception e )
         {
             ResultCodeEnum code;
-            DN dn = null;
+            Dn dn = null;
 
             if ( e instanceof LdapOperationException )
             {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +57,7 @@ public class SimpleMechanismHandler impl
         // any context yet.
         BindOperationContext bindContext = new BindOperationContext( null );
         
-        // Stores the DN of the user to check, and its password
+        // Stores the Dn of the user to check, and its password
         bindContext.setDn( bindRequest.getName() );
         bindContext.setCredentials( bindRequest.getCredentials() );
 
@@ -108,7 +108,7 @@ public class SimpleMechanismHandler impl
                 msg += "\n\nBindRequest = \n" + bindRequest.toString();
             }
 
-            DN name = null;
+            Dn name = null;
             
             if ( e instanceof LdapAuthenticationException )
             {
@@ -119,7 +119,7 @@ public class SimpleMechanismHandler impl
                 && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM )
                     || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM ) ) )
             {
-                result.setMatchedDn( new DN( name ) );
+                result.setMatchedDn( new Dn( name ) );
             }
 
             result.setErrorMessage( msg );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.BindRequest;
-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.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -89,7 +89,7 @@ public class CramMd5CallbackHandler exte
             returningAttributes.add( new AttributeTypeOptions( passwordAT) );
             bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
             
-            DN baseDn = new DN( bindDn );
+            Dn baseDn = new Dn( bindDn );
 
             EntryFilteringCursor cursor = adminSession.search( 
                 baseDn, 
@@ -125,7 +125,7 @@ public class CramMd5CallbackHandler exte
     {
         if ( LOG.isDebugEnabled() )
         {
-            LOG.debug( "Converted username " + getUsername() + " to DN " + bindDn );
+            LOG.debug( "Converted username " + getUsername() + " to Dn " + bindDn );
         }
 
         ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.BindRequest;
-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.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -91,7 +91,7 @@ public class DigestMd5CallbackHandler ex
             returningAttributes.add( new AttributeTypeOptions( passwordAT) );
             bindDn = (String)ldapSession.getSaslProperty( SaslConstants.SASL_USER_BASE_DN );
             
-            DN baseDn = new DN( bindDn );
+            Dn baseDn = new Dn( bindDn );
 
             EntryFilteringCursor cursor = adminSession.search( 
                 baseDn, 
@@ -127,7 +127,7 @@ public class DigestMd5CallbackHandler ex
     {
         if ( LOG.isDebugEnabled() )
         {
-            LOG.debug( "Converted username " + getUsername() + " to DN " + bindDn );
+            LOG.debug( "Converted username " + getUsername() + " to Dn " + bindDn );
         }
 
         ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.StringConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,19 +72,19 @@ public class GssapiCallbackHandler exten
 
     protected void authorize( AuthorizeCallback authorizeCB ) throws Exception
     {
-        LOG.debug( "Processing conversion of principal name to DN." );
+        LOG.debug( "Processing conversion of principal name to Dn." );
 
         String username = authorizeCB.getAuthorizationID();
 
         // find the user's entry
         GetPrincipal getPrincipal = new GetPrincipal( new KerberosPrincipal( username ) );
-        PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new DN( ldapSession
+        PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new Dn( ldapSession
             .getLdapServer().getSearchBaseDn() ) );
         String bindDn = entry.getDistinguishedName();
 
-        LOG.debug( "Converted username {} to DN {}.", username, bindDn );
+        LOG.debug( "Converted username {} to Dn {}.", username, bindDn );
 
-        LdapPrincipal ldapPrincipal = new LdapPrincipal( new DN( entry.getDistinguishedName() ),
+        LdapPrincipal ldapPrincipal = new LdapPrincipal( new Dn( entry.getDistinguishedName() ),
             AuthenticationLevel.STRONG, StringConstants.EMPTY_BYTES );
         ldapSession.putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
         ldapSession.putSaslProperty( Context.SECURITY_PRINCIPAL, bindDn );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.EncryptionKey;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -168,6 +168,6 @@ public class GssapiMechanismHandler exte
     private PrincipalStoreEntry findPrincipal( LdapServer ldapServer, GetPrincipal getPrincipal ) throws Exception
     {
         CoreSession adminSession = ldapServer.getDirectoryService().getAdminSession();
-        return ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new DN( ldapServer.getSearchBaseDn() ) );
+        return ( PrincipalStoreEntry ) getPrincipal.execute( adminSession, new Dn( ldapServer.getSearchBaseDn() ) );
     }
 }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 
 
@@ -156,7 +156,7 @@ public class NtlmSaslServer extends Abst
                 try
                 {
                     result = provider.authenticate( getLdapSession().getIoSession(), response );
-                    DN dn = getBindRequest().getName();
+                    Dn dn = getBindRequest().getName();
                     dn.normalize( getLdapSession().getLdapServer().getDirectoryService().getSchemaManager() );
                     LdapPrincipal ldapPrincipal = new LdapPrincipal( dn, AuthenticationLevel.STRONG );
                     getLdapSession().putSaslProperty( SaslConstants.SASL_AUTHENT_USER, ldapPrincipal );
@@ -186,7 +186,7 @@ public class NtlmSaslServer extends Abst
     private CoreSession authenticate( String user, String password ) throws InvalidNameException, Exception
     {
         BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
-        bindContext.setDn( new DN( user ) );
+        bindContext.setDn( new Dn( user ) );
         bindContext.setCredentials( Strings.getBytesUtf8(password) );
 
         getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.ldap.handlers.bind.AbstractSaslServer;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.PrepareString;
 import org.apache.directory.shared.util.StringConstants;
 import org.apache.directory.shared.util.Strings;
@@ -242,7 +242,7 @@ public class PlainSaslServer extends Abs
     private CoreSession authenticate( String user, String password ) throws InvalidNameException, Exception
     {
         BindOperationContext bindContext = new BindOperationContext( getLdapSession().getCoreSession() );
-        bindContext.setDn( new DN( user ) );
+        bindContext.setDn( new Dn( user ) );
         bindContext.setCredentials( Strings.getBytesUtf8(password) );
         
         getAdminSession().getDirectoryService().getOperationManager().bind( bindContext );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.message.extended.CertGenerationRequest;
 import org.apache.directory.shared.ldap.message.extended.CertGenerationResponse;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -90,7 +90,7 @@ public class CertGenerationRequestHandle
 
         CertGenerationObject certGenObj = container.getCertGenerationObject();
 
-        Entry entry = session.getCoreSession().lookup( new DN( certGenObj.getTargetDN() ) );
+        Entry entry = session.getCoreSession().lookup( new Dn( certGenObj.getTargetDN() ) );
 
         if ( entry != null )
         {

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.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.ExtendedResponse;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.sp.LdapContextParameter;
 import org.apache.directory.shared.util.Strings;
 
@@ -93,7 +93,7 @@ public class StoredProcedureExtendedOper
             if ( value.getClass().equals( LdapContextParameter.class ) )
             {
                 String paramCtx = ( ( LdapContextParameter ) value ).getValue();
-                value = session.getCoreSession().lookup( new DN( paramCtx ) );
+                value = session.getCoreSession().lookup( new Dn( paramCtx ) );
             }
 
             valueList.add( value );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.Response;
 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.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,7 +82,7 @@ public class ReplicaDitStoreUtil
 
     private void init() throws Exception
     {
-        DN replConsumerDn = new DN( REPL_CONSUMER_DN );
+        Dn replConsumerDn = new Dn( REPL_CONSUMER_DN );
 
         if ( !adminSession.exists( replConsumerDn ) )
         {
@@ -106,7 +106,7 @@ public class ReplicaDitStoreUtil
         }
 
         Entry entry = new DefaultEntry( schemaManager );
-        entry.setDn( new DN( "ads-dsReplicaId=" + replica.getId() + "," + REPL_CONSUMER_DN ) );
+        entry.setDn( new Dn( "ads-dsReplicaId=" + replica.getId() + "," + REPL_CONSUMER_DN ) );
 
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "ads-replConsumer" );
         entry.add( "ads-dsReplicaId", String.valueOf( replica.getId() ) );
@@ -146,7 +146,7 @@ public class ReplicaDitStoreUtil
             lastSentCsnAt.add( replica.getLastSentCsn() );
         }
 
-        DN dn = new DN( "ads-dsReplicaId=" + replica.getId() + "," + REPL_CONSUMER_DN );
+        Dn dn = new Dn( "ads-dsReplicaId=" + replica.getId() + "," + REPL_CONSUMER_DN );
         adminSession.modify( dn, mods );
     }
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLog.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLog.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventLog.java Sun Jan 23 01:17:06 2011
@@ -129,7 +129,7 @@ public class ReplicaEventLog
      */
     public void log( EventType event, Entry entry )
     {
-        LOG.debug( "logging entry with DN {} with the event {}", entry.getDn(), event );
+        LOG.debug( "logging entry with Dn {} with the event {}", entry.getDn(), event );
         log( new ReplicaEventMessage( event, entry ) );
     }
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.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.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.name.DnSerializer;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -137,8 +137,8 @@ public class ReplicaEventMessage impleme
         // initialize the entry
         entry = new DefaultEntry( schemaManager );
 
-        // Read the DN
-        DN dn = DnSerializer.deserialize( in );
+        // Read the Dn
+        Dn dn = DnSerializer.deserialize( in );
         entry.setDn( dn );
 
         // Read the number of attributes
@@ -205,7 +205,7 @@ public class ReplicaEventMessage impleme
             out.writeShort( eventType.getMask() );
         }
 
-        // then DN
+        // then Dn
         DnSerializer.serialize( entry.getDn(), out );
 
         // Then the attributes.



Mime
View raw message