directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918774 [1/2] - in /directory/apacheds/trunk: jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ kerberos-shared/src/main...
Date Wed, 03 Mar 2010 23:33:14 GMT
Author: elecharny
Date: Wed Mar  3 23:33:13 2010
New Revision: 918774

URL: http://svn.apache.org/viewvc?rev=918774&view=rev
Log:
Renamed LdapDN, applied to apachedDS

Modified:
    directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
    directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
    directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/LdifPartitionTest.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/SingleBaseSearch.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
    directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java

Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Wed Mar  3 23:33:13 2010
@@ -58,7 +58,7 @@
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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.MatchingRule;
@@ -80,10 +80,10 @@
     private RecordManager recMan;
 
     /** the normalized suffix DN of this backend database */
-    private LdapDN normSuffix;
+    private DN normSuffix;
 
     /** the user provided suffix DN of this backend database */
-    private LdapDN upSuffix;
+    private DN upSuffix;
 
     /** the working directory to use for files */
     private File workingDirectory;
@@ -264,8 +264,8 @@
         ENTRY_CSN_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );
         ENTRY_UUID_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_UUID_AT );
 
-        this.upSuffix = new LdapDN( suffixDn );
-        this.normSuffix = LdapDN.normalize( upSuffix, schemaManager.getNormalizerMapping() );
+        this.upSuffix = new DN( suffixDn );
+        this.normSuffix = DN.normalize( upSuffix, schemaManager.getNormalizerMapping() );
         workingDirectory.mkdirs();
 
         // First, check if the file storing the data exists
@@ -978,9 +978,9 @@
         String targetDn = aliasIdx.reverseLookup( aliasId );
         Long targetId = getEntryId( targetDn );
         String aliasDn = getEntryDn( aliasId );
-        LdapDN aliasDN = ( LdapDN ) new LdapDN( aliasDn );
+        DN aliasDN = ( DN ) new DN( aliasDn );
 
-        LdapDN ancestorDn = ( LdapDN ) aliasDN.clone();
+        DN ancestorDn = ( DN ) aliasDN.clone();
         ancestorDn.remove( aliasDN.size() - 1 );
         Long ancestorId = getEntryId( ancestorDn.toNormName() );
 
@@ -1000,7 +1000,7 @@
 
         while ( !ancestorDn.equals( normSuffix ) && ancestorDn.size() > normSuffix.size() )
         {
-            ancestorDn = ( LdapDN ) ancestorDn.getPrefix( ancestorDn.size() - 1 );
+            ancestorDn = ( DN ) ancestorDn.getPrefix( ancestorDn.size() - 1 );
             ancestorId = getEntryId( ancestorDn.toNormName() );
 
             subAliasIdx.drop( ancestorId, targetId );
@@ -1022,15 +1022,15 @@
      * not allowed due to chaining or cycle formation.
      * @throws Exception if the wrappedCursor btrees cannot be altered
      */
-    private void addAliasIndices( Long aliasId, LdapDN aliasDn, String aliasTarget ) throws Exception
+    private void addAliasIndices( Long aliasId, DN aliasDn, String aliasTarget ) throws Exception
     {
-        LdapDN normalizedAliasTargetDn; // Name value of aliasedObjectName
+        DN normalizedAliasTargetDn; // Name value of aliasedObjectName
         Long targetId; // Id of the aliasedObjectName
-        LdapDN ancestorDn; // Name of an alias entry relative
+        DN ancestorDn; // Name of an alias entry relative
         Long ancestorId; // Id of an alias entry relative
 
         // Access aliasedObjectName, normalize it and generate the Name 
-        normalizedAliasTargetDn = new LdapDN( aliasTarget );
+        normalizedAliasTargetDn = new DN( aliasTarget );
         normalizedAliasTargetDn.normalize( schemaManager.getNormalizerMapping() );
 
         /*
@@ -1126,12 +1126,12 @@
          * index.  If the target is not a sibling of the alias then we add the
          * index entry maping the parent's id to the aliased target id.
          */
-        ancestorDn = ( LdapDN ) aliasDn.clone();
+        ancestorDn = ( DN ) aliasDn.clone();
         ancestorDn.remove( aliasDn.size() - 1 );
         ancestorId = getEntryId( ancestorDn.toNormName() );
 
         // check if alias parent and aliased entry are the same
-        LdapDN normalizedAliasTargetParentDn = ( LdapDN ) normalizedAliasTargetDn.clone();
+        DN normalizedAliasTargetParentDn = ( DN ) normalizedAliasTargetDn.clone();
         normalizedAliasTargetParentDn.remove( normalizedAliasTargetDn.size() - 1 );
         if ( !aliasDn.startsWith( normalizedAliasTargetParentDn ) )
         {
@@ -1183,8 +1183,8 @@
         // capped off using the zero value which no entry can have since 
         // entry sequences start at 1.
         //
-        LdapDN entryDn = entry.getDn();
-        LdapDN parentDn = null;
+        DN entryDn = entry.getDn();
+        DN parentDn = null;
 
         if ( entryDn.getNormName().equals( normSuffix.getNormName() ) )
         {
@@ -1192,7 +1192,7 @@
         }
         else
         {
-            parentDn = ( LdapDN ) entryDn.clone();
+            parentDn = ( DN ) entryDn.clone();
             parentDn.remove( parentDn.size() - 1 );
             parentId = getEntryId( parentDn.toString() );
         }
@@ -1393,13 +1393,13 @@
     }
 
 
-    public LdapDN getSuffix()
+    public DN getSuffix()
     {
         return normSuffix;
     }
 
 
-    public LdapDN getUpSuffix()
+    public DN getUpSuffix()
     {
         return upSuffix;
     }
@@ -1472,7 +1472,7 @@
         if ( modsOid.equals( SchemaConstants.ALIASED_OBJECT_NAME_AT_OID ) )
         {
             String ndnStr = ndnIdx.reverseLookup( id );
-            addAliasIndices( id, new LdapDN( ndnStr ), mods.getString() );
+            addAliasIndices( id, new DN( ndnStr ), mods.getString() );
         }
     }
 
@@ -1657,12 +1657,12 @@
         if ( modsOid.equals( aliasAttributeOid ) && mods.size() > 0 )
         {
             String ndnStr = ndnIdx.reverseLookup( id );
-            addAliasIndices( id, new LdapDN( ndnStr ), mods.getString() );
+            addAliasIndices( id, new DN( ndnStr ), mods.getString() );
         }
     }
 
 
-    public void modify( LdapDN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
+    public void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
     {
         if ( mods instanceof ClonedServerEntry )
         {
@@ -1705,7 +1705,7 @@
     }
 
 
-    public void modify( LdapDN dn, List<Modification> mods ) throws Exception
+    public void modify( DN dn, List<Modification> mods ) throws Exception
     {
         Long id = getEntryId( dn.toString() );
         ServerEntry entry = ( ServerEntry ) master.get( id );
@@ -1759,11 +1759,11 @@
      * @throws Exception if there are any errors propagating the name changes
      */
     @SuppressWarnings("unchecked")
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         Long id = getEntryId( dn.getNormName() );
         ServerEntry entry = lookup( id );
-        LdapDN updn = entry.getDn();
+        DN updn = entry.getDn();
 
         /* 
          * H A N D L E   N E W   R D N
@@ -1865,7 +1865,7 @@
          *    entry and its descendants
          */
 
-        LdapDN newUpdn = ( LdapDN ) updn.clone(); // copy da old updn
+        DN newUpdn = ( DN ) updn.clone(); // copy da old updn
         newUpdn.remove( newUpdn.size() - 1 ); // remove old upRdn
         newUpdn.add( newRdn.getUpName() ); // add da new upRdn
 
@@ -1902,7 +1902,7 @@
      * which affects alias userIndices.
      * @throws NamingException if something goes wrong
      */
-    private void modifyDn( Long id, LdapDN updn, boolean isMove ) throws Exception
+    private void modifyDn( Long id, DN updn, boolean isMove ) throws Exception
     {
         String aliasTarget;
 
@@ -1936,7 +1936,7 @@
 
             if ( null != aliasTarget )
             {
-                addAliasIndices( id, new LdapDN( getEntryDn( id ) ), aliasTarget );
+                addAliasIndices( id, new DN( getEntryDn( id ) ), aliasTarget );
             }
         }
 
@@ -1952,11 +1952,11 @@
              * Calculate the DN for the child's new name by copying the parents
              * new name and adding the child's old upRdn to new name as its RDN
              */
-            LdapDN childUpdn = ( LdapDN ) updn.clone();
-            LdapDN oldUpdn = new LdapDN( getEntryUpdn( childId ) );
+            DN childUpdn = ( DN ) updn.clone();
+            DN oldUpdn = new DN( getEntryUpdn( childId ) );
 
             String rdn = oldUpdn.get( oldUpdn.size() - 1 );
-            LdapDN rdnDN = new LdapDN( rdn );
+            DN rdnDN = new DN( rdn );
             rdnDN.normalize( schemaManager.getNormalizerMapping() );
             childUpdn.add( rdnDN.getRdn() );
 
@@ -1973,11 +1973,11 @@
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         Long childId = getEntryId( oldChildDn.toString() );
         rename( oldChildDn, newRdn, deleteOldRdn );
-        LdapDN newUpdn = move( oldChildDn, childId, newParentDn );
+        DN newUpdn = move( oldChildDn, childId, newParentDn );
 
         // Update the current entry
         ServerEntry entry = lookup( childId );
@@ -1991,10 +1991,10 @@
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn ) throws Exception
     {
         Long childId = getEntryId( oldChildDn.toString() );
-        LdapDN newUpdn = move( oldChildDn, childId, newParentDn );
+        DN newUpdn = move( oldChildDn, childId, newParentDn );
 
         // Update the current entry
         ServerEntry entry = lookup( childId );
@@ -2022,7 +2022,7 @@
      * @param newParentDn the normalized dn of the new parent for the child
      * @throws NamingException if something goes wrong
      */
-    private LdapDN move( LdapDN oldChildDn, Long childId, LdapDN newParentDn ) throws Exception
+    private DN move( DN oldChildDn, Long childId, DN newParentDn ) throws Exception
     {
         // Get the child and the new parent to be entries and Ids
         Long newParentId = getEntryId( newParentDn.toString() );
@@ -2052,9 +2052,9 @@
          * user provided RDN & the new parent's UPDN.  Basically add the child's
          * UpRdn String to the tail of the new parent's Updn Name.
          */
-        LdapDN childUpdn = new LdapDN( getEntryUpdn( childId ) );
+        DN childUpdn = new DN( getEntryUpdn( childId ) );
         String childRdn = childUpdn.get( childUpdn.size() - 1 );
-        LdapDN newUpdn = new LdapDN( getEntryUpdn( newParentId ) );
+        DN newUpdn = new DN( getEntryUpdn( newParentId ) );
         newUpdn.add( newUpdn.size(), childRdn );
 
         // Call the modifyDn operation with the new updn
@@ -2134,7 +2134,7 @@
      * @param movedBase the base at which the move occured - the moved node
      * @throws NamingException if system userIndices fail
      */
-    private void dropMovedAliasIndices( final LdapDN movedBase ) throws Exception
+    private void dropMovedAliasIndices( final DN movedBase ) throws Exception
     {
         //        // Find all the aliases from movedBase down
         //        IndexAssertion<Object,E> isBaseDescendant = new IndexAssertion<Object,E>()
@@ -2174,7 +2174,7 @@
      * @param movedBase the base where the move occured
      * @throws Exception if userIndices fail
      */
-    private void dropAliasIndices( Long aliasId, LdapDN movedBase ) throws Exception
+    private void dropAliasIndices( Long aliasId, DN movedBase ) throws Exception
     {
         String targetDn = aliasIdx.reverseLookup( aliasId );
         Long targetId = getEntryId( targetDn );
@@ -2184,7 +2184,7 @@
          * Start droping index tuples with the first ancestor right above the 
          * moved base.  This is the first ancestor effected by the move.
          */
-        LdapDN ancestorDn = ( LdapDN ) movedBase.getPrefix( 1 );
+        DN ancestorDn = ( DN ) movedBase.getPrefix( 1 );
         Long ancestorId = getEntryId( ancestorDn.toString() );
 
         /*
@@ -2208,7 +2208,7 @@
 
         while ( !ancestorDn.equals( upSuffix ) )
         {
-            ancestorDn = ( LdapDN ) ancestorDn.getPrefix( 1 );
+            ancestorDn = ( DN ) ancestorDn.getPrefix( 1 );
             ancestorId = getEntryId( ancestorDn.toString() );
 
             subAliasIdx.drop( ancestorId, targetId );

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Wed Mar  3 23:33:13 2010
@@ -57,7 +57,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
@@ -433,7 +433,7 @@
     @Test
     public void testFreshStore() throws Exception
     {
-        LdapDN dn = new LdapDN( "o=Good Times Co." );
+        DN dn = new DN( "o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         assertEquals( 1L, ( long ) store.getEntryId( dn.toNormName() ) );
         assertEquals( 11, store.count() );
@@ -468,7 +468,7 @@
         assertEquals( 10, store.count() );
 
         // add an alias and delete to test dropAliasIndices method
-        LdapDN dn = new LdapDN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
+        DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
@@ -517,7 +517,7 @@
         assertFalse( cursor.next() );
 
         // dn id 12
-        LdapDN martinDn = new LdapDN( "cn=Marting King,ou=Sales,o=Good Times Co." );
+        DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co." );
         martinDn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, martinDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -532,7 +532,7 @@
         assertTrue( cursor.previous() );
         assertEquals( 12, ( long ) cursor.get().getId() );
 
-        LdapDN newParentDn = new LdapDN( "ou=Board of Directors,o=Good Times Co." );
+        DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co." );
         newParentDn.normalize( schemaManager.getNormalizerMapping() );
 
         store.move( martinDn, newParentDn );
@@ -542,7 +542,7 @@
         assertEquals( 12, ( long ) cursor.get().getId() );
 
         // dn id 13
-        LdapDN marketingDn = new LdapDN( "ou=Marketing,ou=Sales,o=Good Times Co." );
+        DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co." );
         marketingDn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, marketingDn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -552,7 +552,7 @@
         store.add( entry );
 
         // dn id 14
-        LdapDN jimmyDn = new LdapDN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
+        DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
         jimmyDn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, jimmyDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -831,7 +831,7 @@
     @Test(expected = LdapNameNotFoundException.class)
     public void testAddWithoutParentId() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
+        DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -844,7 +844,7 @@
     @Test(expected = LdapSchemaViolationException.class)
     public void testAddWithoutObjectClass() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Martin King,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "ou", "Sales" );
@@ -856,7 +856,7 @@
     @Test
     public void testModifyAddOUAttrib() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -875,7 +875,7 @@
     @Test
     public void testRename() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -895,7 +895,7 @@
     @Test
     public void testRenameEscaped() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -910,7 +910,7 @@
 
         store.rename( dn, rdn, true );
 
-        LdapDN dn2 = new LdapDN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
+        DN dn2 = new DN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
         dn2.normalize( schemaManager.getNormalizerMapping() );
         Long id = store.getEntryId( dn2.getNormName() );
         assertNotNull( id );
@@ -922,7 +922,7 @@
     @Test
     public void testMove() throws Exception
     {
-        LdapDN childDn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         childDn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry childEntry = new DefaultServerEntry( schemaManager, childDn );
         childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -933,7 +933,7 @@
 
         store.add( childEntry );
 
-        LdapDN parentDn = new LdapDN( "ou=Sales,o=Good Times Co." );
+        DN parentDn = new DN( "ou=Sales,o=Good Times Co." );
         parentDn.normalize( schemaManager.getNormalizerMapping() );
 
         RDN rdn = new RDN( "cn=Ryan" );
@@ -941,10 +941,10 @@
         store.move( childDn, parentDn, rdn, true );
 
         // to drop the alias indices   
-        childDn = new LdapDN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co." );
+        childDn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co." );
         childDn.normalize( schemaManager.getNormalizerMapping() );
 
-        parentDn = new LdapDN( "ou=Engineering,o=Good Times Co." );
+        parentDn = new DN( "ou=Engineering,o=Good Times Co." );
         parentDn.normalize( schemaManager.getNormalizerMapping() );
 
         assertEquals( 3, store.getSubAliasIndex().count() );
@@ -958,7 +958,7 @@
     @Test
     public void testModifyAdd() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -990,7 +990,7 @@
     @Test
     public void testModifyReplace() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -1023,7 +1023,7 @@
     @Test
     public void testModifyRemove() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -1056,7 +1056,7 @@
     @Test
     public void testModifyReplaceNonExistingIndexAttribute() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Tim B,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java Wed Mar  3 23:33:13 2010
@@ -34,7 +34,7 @@
 import org.apache.directory.server.core.partition.impl.btree.jdbm.ServerEntrySerializer;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -124,7 +124,7 @@
     
     @Test public void testSerializeEmtpyServerEntry() throws Exception
     {
-        LdapDN dn = LdapDN.EMPTY_LDAPDN;
+        DN dn = DN.EMPTY_DN;
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
 
         ServerEntrySerializer ses = new ServerEntrySerializer( schemaManager );
@@ -139,7 +139,7 @@
 
     @Test public void testSerializeDNServerEntry() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=text, dc=example, dc=com" );
+        DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -156,7 +156,7 @@
 
     @Test public void testSerializeServerEntryOC() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=text, dc=example, dc=com" );
+        DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -174,7 +174,7 @@
 
     @Test public void testSerializeServerEntry() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=text, dc=example, dc=com" );
+        DN dn = new DN( "cn=text, dc=example, dc=com" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -195,7 +195,7 @@
 
     @Test public void testSerializeServerEntryWithEmptyDN() throws Exception
     {
-        LdapDN dn = new LdapDN( "" );
+        DN dn = new DN( "" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -216,7 +216,7 @@
     
     @Test public void testSerializeServerEntryWithNoAttributes() throws Exception
     {
-        LdapDN dn = new LdapDN( "" );
+        DN dn = new DN( "" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -233,7 +233,7 @@
     
     @Test public void testSerializeServerEntryWithAttributeNoValue() throws Exception
     {
-        LdapDN dn = new LdapDN( "" );
+        DN dn = new DN( "" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -252,7 +252,7 @@
 
     @Test public void testSerializeServerEntryWithAttributeStringValue() throws Exception
     {
-        LdapDN dn = new LdapDN( "" );
+        DN dn = new DN( "" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );
@@ -270,7 +270,7 @@
 
     @Test public void testSerializeServerEntryWithAttributeBinaryValue() throws Exception
     {
-        LdapDN dn = new LdapDN( "" );
+        DN dn = new DN( "" );
         dn.normalize( oids );
         
         ServerEntry entry = new DefaultServerEntry( schemaManager, dn );

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java Wed Mar  3 23:33:13 2010
@@ -23,7 +23,7 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -37,7 +37,7 @@
 {
     /** The directory service backing store for this PrincipalStore. */
     private final DirectoryService directoryService;
-    private final LdapDN searchBaseDn;
+    private final DN searchBaseDn;
     
     
     /**
@@ -45,7 +45,7 @@
      *
      * @param directoryService backing store for this PrincipalStore
      */
-    public DirectoryPrincipalStore( DirectoryService directoryService, LdapDN searchBaseDn )
+    public DirectoryPrincipalStore( DirectoryService directoryService, DN searchBaseDn )
     {
         this.directoryService = directoryService;
         this.searchBaseDn = searchBaseDn;

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java Wed Mar  3 23:33:13 2010
@@ -28,7 +28,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -41,10 +41,10 @@
 class SingleBaseSearch implements PrincipalStore
 {
     private final CoreSession session;
-    private final LdapDN searchBaseDn;
+    private final DN searchBaseDn;
 
 
-    SingleBaseSearch( DirectoryService directoryService, LdapDN searchBaseDn )
+    SingleBaseSearch( DirectoryService directoryService, DN searchBaseDn )
     {
         try
         {

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Wed Mar  3 23:33:13 2010
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -69,7 +69,7 @@
     }
 
 
-    public Object execute( CoreSession session, LdapDN searchBaseDn ) throws Exception
+    public Object execute( CoreSession session, DN searchBaseDn ) throws Exception
     {
         if ( principal == null )
         {

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Wed Mar  3 23:33:13 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntryModifier;
 import org.apache.directory.server.protocol.shared.store.DirectoryServiceOperation;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -72,7 +72,7 @@
      * Note that the base is a relative path from the existing context.
      * It is not a DN.
      */
-    public Object execute( CoreSession session, LdapDN base ) throws Exception
+    public Object execute( CoreSession session, DN base ) throws Exception
     {
         if ( principal == null )
         {

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Wed Mar  3 23:33:13 2010
@@ -35,7 +35,7 @@
 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.LdapDN;
+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 @@
      * @return the resultant server entry for the PrincipalStoreEntry argument
      * @throws Exception if there are problems accessing registries
      */
-    public static ServerEntry toServerEntry( CoreSession session, LdapDN dn, PrincipalStoreEntry principalEntry ) 
+    public static ServerEntry toServerEntry( CoreSession session, DN dn, PrincipalStoreEntry principalEntry ) 
         throws Exception
     {
         ServerEntry outAttrs = session.getDirectoryService().newEntry( dn );
@@ -119,7 +119,7 @@
      * @return the server entry for the principal or null if non-existent
      * @throws Exception if there are problems while searching the directory
      */
-    public static ServerEntry findPrincipalEntry( CoreSession session, LdapDN searchBaseDn, String principal ) 
+    public static ServerEntry findPrincipalEntry( CoreSession session, DN searchBaseDn, String principal ) 
         throws Exception
     {
         EntryFilteringCursor cursor = null;

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=918774&r1=918773&r2=918774&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 Wed Mar  3 23:33:13 2010
@@ -54,7 +54,7 @@
 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.LdapDN;
+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;
@@ -323,7 +323,7 @@
         modifyContext.setAlteredEntry( modifiedEntry );
 
         // just overwrite the existing file
-        LdapDN dn = modifyContext.getDn();
+        DN dn = modifyContext.getDn();
 
         // And write it back on disk
         FileWriter fw = new FileWriter( getFile( dn, DELETE ) );
@@ -338,7 +338,7 @@
     @Override
     public void move( MoveOperationContext moveContext ) throws Exception
     {
-        LdapDN oldDn = moveContext.getDn();
+        DN oldDn = moveContext.getDn();
         Long id = getEntryId( oldDn.getNormName() );
 
         wrappedPartition.move( moveContext );
@@ -356,7 +356,7 @@
     @Override
     public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext ) throws Exception
     {
-        LdapDN oldDn = moveAndRenameContext.getDn();
+        DN oldDn = moveAndRenameContext.getDn();
         Long id = getEntryId( oldDn.getNormName() );
 
         wrappedPartition.moveAndRename( moveAndRenameContext );
@@ -375,7 +375,7 @@
     @Override
     public void rename( RenameOperationContext renameContext ) throws Exception
     {
-        LdapDN oldDn = renameContext.getDn();
+        DN oldDn = renameContext.getDn();
         Long id = getEntryId( oldDn.getNormName() );
 
         // Create the new entry 
@@ -401,7 +401,7 @@
      * @param deleteOldEntry a flag to tell whether to delete the old entry files
      * @throws Exception
      */
-    private void entryMoved( LdapDN oldEntryDn, Entry modifiedEntry, Long entryIdOld, boolean deleteOldEntry )
+    private void entryMoved( DN oldEntryDn, Entry modifiedEntry, Long entryIdOld, boolean deleteOldEntry )
         throws Exception
     {
         // First, add the new entry
@@ -518,12 +518,12 @@
     /**
      * Create the file name from the entry DN.
      */
-    private File getFile( LdapDN entryDn, boolean create ) throws NamingException
+    private File getFile( DN entryDn, boolean create ) throws NamingException
     {
         StringBuilder filePath = new StringBuilder();
         filePath.append( suffixDirectory ).append( File.separator );
 
-        LdapDN baseDn = ( LdapDN ) entryDn.getSuffix( suffix.size() );
+        DN baseDn = ( DN ) entryDn.getSuffix( suffix.size() );
 
         for ( int i = 0; i < baseDn.size() - 1; i++ )
         {
@@ -584,7 +584,7 @@
      * 
      * We don't allow filename which length is > 255 chars.
      */
-    private String getFileName( LdapDN dn ) throws NamingException
+    private String getFileName( DN dn ) throws NamingException
     {
         StringBuilder sb = new StringBuilder();
         boolean isFirst = true;

Modified: directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifStore.java Wed Mar  3 23:33:13 2010
@@ -41,7 +41,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
@@ -166,7 +166,7 @@
     }
 
 
-    private File getFile( LdapDN entryDn )
+    private File getFile( DN entryDn )
     {
         int size = entryDn.size();
 
@@ -233,31 +233,31 @@
     }
 
 
-    public void modify( LdapDN dn, List<Modification> mods ) throws Exception
+    public void modify( DN dn, List<Modification> mods ) throws Exception
     {
         wrappedStore.modify( dn, mods );
     }
 
 
-    public void modify( LdapDN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
+    public void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
     {
         wrappedStore.modify( dn, modOp, mods );
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         wrappedStore.move( oldChildDn, newParentDn, newRdn, deleteOldRdn );
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn ) throws Exception
     {
         wrappedStore.move( oldChildDn, newParentDn );
     }
 
 
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         wrappedStore.rename( dn, newRdn, deleteOldRdn );
     }
@@ -552,7 +552,7 @@
     }
 
 
-    public LdapDN getSuffix()
+    public DN getSuffix()
     {
         return wrappedStore.getSuffix();
     }
@@ -564,7 +564,7 @@
     }
 
 
-    public LdapDN getUpSuffix()
+    public DN getUpSuffix()
     {
         return wrappedStore.getUpSuffix();
     }

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=918774&r1=918773&r2=918774&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 Wed Mar  3 23:33:13 2010
@@ -56,7 +56,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -162,7 +162,7 @@
     private ClonedServerEntry createEntry( String dn ) throws Exception
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
-        entry.setDn( new LdapDN( dn ).normalize( schemaManager.getNormalizerMapping() ) );
+        entry.setDn( new DN( dn ).normalize( schemaManager.getNormalizerMapping() ) );
         entry.put( SchemaConstants.ENTRY_CSN_AT, defaultCSNFactory.newInstance().toString() );
         entry.add( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
         
@@ -183,7 +183,7 @@
     @Test
     public void testLdifAddEntries() throws Exception
     {
-        LdapDN adminDn = new LdapDN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
+        DN adminDn = new DN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
         
@@ -218,7 +218,7 @@
     @Test
     public void testLdifAddExistingEntry() throws Exception
     {
-        LdapDN adminDn = new LdapDN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
+        DN adminDn = new DN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
         
@@ -271,7 +271,7 @@
     @Test
     public void testLdifDeleteExistingEntry() throws Exception
     {
-        LdapDN adminDn = new LdapDN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
+        DN adminDn = new DN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
         
@@ -298,7 +298,7 @@
         
         DeleteOperationContext delCtx = new DeleteOperationContext( session );
 
-        LdapDN dn = new LdapDN( "dc=test1,dc=test,ou=test,ou=system" );
+        DN dn = new DN( "dc=test1,dc=test,ou=test,ou=system" );
         dn.normalize( schemaManager.getNormalizerMapping() );
         
         delCtx.setDn( dn );
@@ -314,7 +314,7 @@
         assertFalse( new File( wkdir, "ou=test,ou=system/dc=test/dc=test2" ).exists() );
         assertTrue( new File( wkdir, "ou=test,ou=system/dc=test/dc=test2.ldif" ).exists() );
 
-        dn = new LdapDN( "dc=test2,dc=test,ou=test,ou=system" );
+        dn = new DN( "dc=test2,dc=test,ou=test,ou=system" );
         dn.normalize( schemaManager.getNormalizerMapping() );
         
         delCtx.setDn( dn );
@@ -339,7 +339,7 @@
     @Test
     public void testLdifSearchExistingEntry() throws Exception
     {
-        LdapDN adminDn = new LdapDN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
+        DN adminDn = new DN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
         
@@ -366,7 +366,7 @@
         
         SearchOperationContext searchCtx = new SearchOperationContext( session );
 
-        LdapDN dn = new LdapDN( "dc=test,ou=test,ou=system" );
+        DN dn = new DN( "dc=test,ou=test,ou=system" );
         dn.normalize( schemaManager.getNormalizerMapping() );
         searchCtx.setDn( dn );
         ExprNode filter = FilterParser.parse( "(ObjectClass=domain)" );
@@ -404,8 +404,8 @@
     {
         CoreSession session = injectEntries();
 
-        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new LdapDN( "dc=child1,ou=test,ou=system" ).normalize( schemaManager.getNormalizerMapping() ).getNormName() ) );
-        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new LdapDN( "dc=child2,ou=test,ou=system" ).normalize( schemaManager.getNormalizerMapping() ).getNormName() ) );
+        ClonedServerEntry childEntry1 = partition.lookup( partition.getEntryId( new DN( "dc=child1,ou=test,ou=system" ).normalize( schemaManager.getNormalizerMapping() ).getNormName() ) );
+        ClonedServerEntry childEntry2 = partition.lookup( partition.getEntryId( new DN( "dc=child2,ou=test,ou=system" ).normalize( schemaManager.getNormalizerMapping() ).getNormName() ) );
         
         MoveOperationContext moveOpCtx = new MoveOperationContext( session, childEntry1.getDn(), childEntry2.getDn() );
         partition.move( moveOpCtx );
@@ -430,7 +430,7 @@
     {
         CoreSession session = injectEntries();
 
-        LdapDN childDn1 = new LdapDN( "dc=child1,ou=test,ou=system" );
+        DN childDn1 = new DN( "dc=child1,ou=test,ou=system" );
         childDn1.normalize( schemaManager.getNormalizerMapping() );
         
         RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
@@ -456,7 +456,7 @@
     {
         CoreSession session = injectEntries();
 
-        LdapDN childDn1 = new LdapDN( "dc=child1,ou=test,ou=system" );
+        DN childDn1 = new DN( "dc=child1,ou=test,ou=system" );
         childDn1.normalize( schemaManager.getNormalizerMapping() );
         
         RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "renamedChild1" );
@@ -482,10 +482,10 @@
     {
         CoreSession session = injectEntries();
 
-        LdapDN childDn1 = new LdapDN( "dc=child1,ou=test,ou=system" );
+        DN childDn1 = new DN( "dc=child1,ou=test,ou=system" );
         childDn1.normalize( schemaManager.getNormalizerMapping() );
 
-        LdapDN childDn2 = new LdapDN( "dc=child2,ou=test,ou=system" );
+        DN childDn2 = new DN( "dc=child2,ou=test,ou=system" );
         childDn2.normalize( schemaManager.getNormalizerMapping() );
 
         RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
@@ -511,10 +511,10 @@
     {
         CoreSession session = injectEntries();
 
-        LdapDN childDn1 = new LdapDN( "dc=child1,ou=test,ou=system" );
+        DN childDn1 = new DN( "dc=child1,ou=test,ou=system" );
         childDn1.normalize( schemaManager.getNormalizerMapping() );
 
-        LdapDN childDn2 = new LdapDN( "dc=child2,ou=test,ou=system" );
+        DN childDn2 = new DN( "dc=child2,ou=test,ou=system" );
         childDn2.normalize( schemaManager.getNormalizerMapping() );
 
         RDN newRdn = new RDN( SchemaConstants.DC_AT + "=" + "movedChild1" );
@@ -537,7 +537,7 @@
     
     private CoreSession injectEntries() throws Exception
     {
-        LdapDN adminDn = new LdapDN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
+        DN adminDn = new DN( "uid=admin,ou=system" ).normalize( schemaManager.getNormalizerMapping() );
         CoreSession session = new MockCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), new MockDirectoryService( 1 ) );
         AddOperationContext addCtx = new AddOperationContext( session );
         

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/MultiBaseSearch.java Wed Mar  3 23:33:13 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.server.protocol.shared.catalog.Catalog;
 import org.apache.directory.server.protocol.shared.catalog.GetCatalog;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -85,7 +85,7 @@
             GetRecords getRecords = new GetRecords( question );
             String baseDn = catalog.getBaseDn( question.getDomainName() );
             CoreSession session = directoryService.getSession();
-            DirContext dirContext = new ServerLdapContext( directoryService, session, new LdapDN( baseDn ) );
+            DirContext dirContext = new ServerLdapContext( directoryService, session, new DN( baseDn ) );
             return getRecords.execute( dirContext, null );
         }
         catch ( LdapNameNotFoundException lnnfe )

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=918774&r1=918773&r2=918774&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 Wed Mar  3 23:33:13 2010
@@ -35,7 +35,7 @@
 import org.apache.directory.server.dns.store.jndi.operations.GetRecords;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +62,7 @@
         try
         {
             CoreSession session = directoryService.getSession();
-            ctx = new ServerLdapContext( directoryService, session, new LdapDN( searchBaseDn ) );
+            ctx = new ServerLdapContext( directoryService, session, new DN( searchBaseDn ) );
         } catch ( Exception e )
         {
             throw new ServiceConfigurationException( I18n.err( I18n.ERR_649, searchBaseDn ), e );

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Wed Mar  3 23:33:13 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -50,12 +50,12 @@
     /**
      * Note that the base is relative to the existing context.
      */
-    public Object execute( CoreSession session, LdapDN base ) throws Exception
+    public Object execute( CoreSession session, DN base ) throws Exception
     {
         String filter = "(objectClass=" + ApacheSchemaConstants.APACHE_CATALOG_ENTRY_OC + ")";
 
         EntryFilteringCursor list = session.search( 
-            LdapDN.EMPTY_LDAPDN, 
+            DN.EMPTY_DN, 
             SearchScope.SUBTREE, 
             FilterParser.parse( filter ), 
             AliasDerefMode.DEREF_ALWAYS,

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java Wed Mar  3 23:33:13 2010
@@ -23,7 +23,7 @@
 import java.io.Serializable;
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -42,5 +42,5 @@
      * @return Object The result returned by the command
      * @throws Exception The exception thrown by the command
      */
-    public Object execute( CoreSession session, LdapDN baseDn ) throws Exception;
+    public Object execute( CoreSession session, DN baseDn ) throws Exception;
 }

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Wed Mar  3 23:33:13 2010
@@ -36,7 +36,7 @@
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,7 +132,7 @@
      * @param entry the attributes of the entry
      * @return true if all filters passed the entry, false otherwise
      */
-    private boolean applyFilters( LdapDN dn, Entry entry )
+    private boolean applyFilters( DN dn, Entry entry )
     {
         boolean accept = true;
         final int limit = filters.size();
@@ -170,7 +170,7 @@
      */
     public int execute()
     {
-        LdapDN rdn = null;
+        DN rdn = null;
         InputStream in = null;
 
         try
@@ -179,7 +179,7 @@
 
             for ( LdifEntry ldifEntry:new LdifReader( in ) )
             {
-                LdapDN dn = ldifEntry.getDn();
+                DN dn = ldifEntry.getDn();
 
                 if ( ldifEntry.isEntry() )
                 {

Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifLoadFilter.java Wed Mar  3 23:33:13 2010
@@ -24,7 +24,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 import java.io.File;
 
@@ -47,5 +47,5 @@
      * @return true if the entry will be created in the DIT, false if it is to be skipped
      * @throws NamingException
      */
-    boolean filter( File file, LdapDN dn, Entry entry, CoreSession coreSession ) throws NamingException;
+    boolean filter( File file, DN dn, Entry entry, CoreSession coreSession ) throws NamingException;
 }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Wed Mar  3 23:33:13 2010
@@ -84,7 +84,7 @@
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -289,7 +289,7 @@
         LdapConnection con = getClientApiConnection( ldapServer );
         
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultClientEntry( new LdapDN( dn ) );
+        Entry kate = new DefaultClientEntry( new DN( dn ) );
 
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
@@ -329,7 +329,7 @@
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultClientEntry( new LdapDN( dn ) );
+        Entry kate = new DefaultClientEntry( new DN( dn ) );
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
         kate.add( "cn", "Kate Bush" );
@@ -369,7 +369,7 @@
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultClientEntry( new LdapDN( dn ) );
+        Entry kate = new DefaultClientEntry( new DN( dn ) );
         
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
@@ -737,7 +737,7 @@
             principalDn = "";
         }
         
-        LdapDN userDn = new LdapDN( principalDn );
+        DN userDn = new DN( principalDn );
         userDn.normalize( service.getSchemaManager().getNormalizerMapping() );
         LdapPrincipal principal = new LdapPrincipal( userDn, AuthenticationLevel.SIMPLE );
         
@@ -747,7 +747,7 @@
         }
         
         CoreSession session = service.getSession( principal );
-        LdapContext ctx = new ServerLdapContext( service, session, new LdapDN( dn ) );
+        LdapContext ctx = new ServerLdapContext( service, session, new DN( dn ) );
         return ctx;
     }
     
@@ -1230,7 +1230,7 @@
         LdapConnection con = getClientApiConnection( ldapServer );
         
         String dn = "cn=Kate Bush," + BASE;
-        Entry entry = new DefaultClientEntry( new LdapDN( dn ) );
+        Entry entry = new DefaultClientEntry( new DN( dn ) );
         entry.add( "objectclass", "top", "person" );
         entry.add( "sn", "Bush" );
         entry.add( "cn", "Kate Bush" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Wed Mar  3 23:33:13 2010
@@ -38,7 +38,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -164,8 +164,8 @@
         // JNDI issue: must use the name object here rather then string,
         // otherwise more backslashes are needed
         // works with both javax.naming.ldap.LdapName or 
-        // org.apache.directory.shared.ldap.name.LdapDN
-        LdapDN ldapRdn = new LdapDN( rdn );
+        // org.apache.directory.shared.ldap.name.DN
+        DN ldapRdn = new DN( rdn );
         ctx.createSubcontext( ldapRdn, attrs );
 
         SearchControls sctls = new SearchControls();
@@ -201,8 +201,8 @@
         // JNDI issue: must use the name object here rather then string,
         // otherwise more backslashes are needed
         // works with both javax.naming.ldap.LdapName or 
-        // org.apache.directory.shared.ldap.name.LdapDN
-        LdapDN ldapRdn = new LdapDN( rdn );
+        // org.apache.directory.shared.ldap.name.DN
+        DN ldapRdn = new DN( rdn );
         ctx.createSubcontext( ldapRdn, attrs );
 
         SearchControls sctls = new SearchControls();

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Wed Mar  3 23:33:13 2010
@@ -60,7 +60,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
 import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -503,7 +503,7 @@
              
              // Setup the bind request
              BindRequestImpl request = new BindRequestImpl( 1 ) ;
-             request.setName( new LdapDN( "uid=admin,ou=system" ) ) ;
+             request.setName( new DN( "uid=admin,ou=system" ) ) ;
              request.setSimple( false ) ;
              request.setCredentials( type1response ) ;
              request.setSaslMechanism( mechanism );
@@ -541,7 +541,7 @@
              
              // Setup the bind request
              BindRequestImpl request = new BindRequestImpl( 2 ) ;
-             request.setName( new LdapDN( "uid=admin,ou=system" ) ) ;
+             request.setName( new DN( "uid=admin,ou=system" ) ) ;
              request.setSimple( false ) ;
              request.setCredentials( type3response ) ;
              request.setSaslMechanism( mechanism );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java Wed Mar  3 23:33:13 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +50,7 @@
      */
     public static void deleteSubtree( CoreSession session, Name rdn ) throws Exception
     {
-        EntryFilteringCursor results = session.list( (LdapDN)rdn, AliasDerefMode.DEREF_ALWAYS, null );
+        EntryFilteringCursor results = session.list( (DN)rdn, AliasDerefMode.DEREF_ALWAYS, null );
         
         results.beforeFirst();
         
@@ -62,7 +62,7 @@
             deleteSubtree( session, childRdn );
         }
         
-        session.delete( (LdapDN)rdn );
+        session.delete( (DN)rdn );
         log.info( "Deleted: " + rdn );
     }
 }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Wed Mar  3 23:33:13 2010
@@ -156,8 +156,8 @@
         
         JavaStoredProcUtils.loadStoredProcedureClass( spCtx, DITUtilitiesSP.class );
         
-        LdapDN people = new LdapDN( "ou=People" );
-        people = LdapDN.normalize(  people, oids );
+        DN people = new DN( "ou=People" );
+        people = DN.normalize(  people, oids );
         
         String spName = DITUtilitiesSP.class.getName() + ":deleteSubtree";
         Object[] params = new Object[] { new LdapContextParameter( "ou=system" ),

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Wed Mar  3 23:33:13 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -92,7 +92,7 @@
     {
         LdapConnection con = getClientApiConnection( ldapServer );
 
-        ModifyRequest modReq = new ModifyRequest( new LdapDN( DN ) );
+        ModifyRequest modReq = new ModifyRequest( new DN( DN ) );
         modReq.add( "description", "" );
 
         ModifyResponse resp = con.modify( modReq );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Wed Mar  3 23:33:13 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Wed Mar  3 23:33:13 2010
@@ -65,7 +65,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -1631,7 +1631,7 @@
             for ( int i = 0; i < 1000; i++ )
             {
                 String dn = "cn=user" + i + "," + BASE;
-                Entry kate = new DefaultClientEntry( new LdapDN( dn ) );
+                Entry kate = new DefaultClientEntry( new DN( dn ) );
 
                 kate.add( "objectclass", "top", "person" );
                 kate.add( "sn", "Bush" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java Wed Mar  3 23:33:13 2010
@@ -47,7 +47,7 @@
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.operations.bind.BogusNtlmProvider;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -121,7 +121,7 @@
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
         ServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
-            new LdapDN( "uid=admin,ou=system" ) );
+            new DN( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 
         // now update the certificate (over the wire)

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java Wed Mar  3 23:33:13 2010
@@ -61,7 +61,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.integ.ServerIntegrationUtils;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -121,7 +121,7 @@
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        ClonedServerEntry entry = session.lookup( new LdapDN( "uid=admin,ou=system" ), CERT_IDS );
+        ClonedServerEntry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Wed Mar  3 23:33:13 2010
@@ -52,7 +52,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -114,7 +114,7 @@
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        ClonedServerEntry entry = session.lookup( new LdapDN( "uid=admin,ou=system" ), CERT_IDS );
+        ClonedServerEntry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Wed Mar  3 23:33:13 2010
@@ -52,7 +52,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -112,7 +112,7 @@
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        ClonedServerEntry entry = session.lookup( new LdapDN( "uid=admin,ou=system" ), CERT_IDS );
+        ClonedServerEntry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 
@@ -172,7 +172,7 @@
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
         ServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
-            new LdapDN( "uid=admin,ou=system" ) );
+            new DN( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 
         // now update the certificate (over the wire)

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Wed Mar  3 23:33:13 2010
@@ -24,7 +24,7 @@
 
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -59,11 +59,11 @@
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
         }
         
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testMethodA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testMethodA,ou=system" ) ) );
     }
 
 
@@ -79,12 +79,12 @@
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassA2,ou=system" ) ) );
-        assertFalse( service.getAdminSession().exists( new LdapDN( "cn=testMethodA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testMethodWithApplyLdif,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA2,ou=system" ) ) );
+        assertFalse( service.getAdminSession().exists( new DN( "cn=testMethodA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testMethodWithApplyLdif,ou=system" ) ) );
     }
 }



Mime
View raw message