directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [16/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/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sun Jan 23 01:17:06 2011
@@ -47,9 +47,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 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.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.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -92,8 +92,8 @@ public abstract class AbstractStore<E, I
     /** The store unique identifier */
     protected String id;
 
-    /** The suffix DN */
-    protected DN suffixDn;
+    /** The suffix Dn */
+    protected Dn suffixDn;
 
     /** A pointer on the schemaManager */
     protected SchemaManager schemaManager;
@@ -110,7 +110,7 @@ public abstract class AbstractStore<E, I
     /** the attribute presence index */
     protected Index<String, E, ID> presenceIdx;
 
-    /** a system index on the entries of descendants of root DN*/
+    /** a system index on the entries of descendants of root Dn*/
     protected Index<ID, E, ID> subLevelIdx;
 
     /** the parent child relationship index */
@@ -224,7 +224,7 @@ public abstract class AbstractStore<E, I
     }
 
 
-    public void setSuffixDn( DN suffixDn )
+    public void setSuffixDn( Dn suffixDn )
     {
         protect( "suffixDn" );
 
@@ -237,7 +237,7 @@ public abstract class AbstractStore<E, I
     }
 
 
-    public DN getSuffixDn()
+    public Dn getSuffixDn()
     {
         return suffixDn;
     }
@@ -765,14 +765,14 @@ public abstract class AbstractStore<E, I
 
 
     //------------------------------------------------------------------------
-    // DN and ID handling
+    // Dn and ID handling
     //------------------------------------------------------------------------
     /**
      * {@inheritDoc}
      */
-    public ID getEntryId( DN dn ) throws Exception
+    public ID getEntryId( Dn dn ) throws Exception
     {
-        // Just to be sure that the DN is normalized
+        // Just to be sure that the Dn is normalized
         if ( !dn.isNormalized() )
         {
             dn.normalize( schemaManager );
@@ -783,7 +783,7 @@ public abstract class AbstractStore<E, I
 
         ParentIdAndRdn<ID> key = new ParentIdAndRdn<ID>( getRootId(), suffixDn.getRdns() );
 
-        // Check into the RDN index
+        // Check into the Rdn index
         ID curEntryId = rdnIdx.forwardLookup( key );
 
         for ( ; i < dnSize; i++ )
@@ -804,7 +804,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public DN getEntryDn( ID id ) throws Exception
+    public Dn getEntryDn( ID id ) throws Exception
     {
         return buildEntryDn( id );
     }
@@ -839,7 +839,7 @@ public abstract class AbstractStore<E, I
 
         if ( entry != null )
         {
-            DN dn = buildEntryDn( id );
+            Dn dn = buildEntryDn( id );
             entry.setDn( dn );
             return entry;
         }
@@ -874,7 +874,7 @@ public abstract class AbstractStore<E, I
             throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
 
-        DN entryDn = entry.getDn();
+        Dn entryDn = entry.getDn();
 
         if ( checkHasEntryDuringAdd )
         {
@@ -895,7 +895,7 @@ public abstract class AbstractStore<E, I
         // capped off using the zero value which no entry can have since
         // entry sequences start at 1.
         //
-        DN parentDn = null;
+        Dn parentDn = null;
         ParentIdAndRdn<ID> key = null;
 
         if ( entryDn.equals( suffixDn ) )
@@ -1023,7 +1023,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized void modify( DN dn, ModificationOperation modOp, Entry mods ) throws Exception
+    public synchronized void modify( Dn dn, ModificationOperation modOp, Entry mods ) throws Exception
     {
         if ( mods instanceof ClonedServerEntry )
         {
@@ -1070,7 +1070,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized Entry modify( DN dn, List<Modification> mods ) throws Exception
+    public synchronized Entry modify( Dn dn, List<Modification> mods ) throws Exception
     {
         ID id = getEntryId( dn );
         Entry entry = master.get( id );
@@ -1168,7 +1168,7 @@ public abstract class AbstractStore<E, I
      * {@inheritDoc}
      */
     @SuppressWarnings("unchecked")
-    public synchronized void rename( DN dn, RDN newRdn, boolean deleteOldRdn, Entry entry ) throws Exception
+    public synchronized void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, Entry entry ) throws Exception
     {
         ID id = getEntryId( dn );
 
@@ -1177,20 +1177,20 @@ public abstract class AbstractStore<E, I
             entry = lookup( id );
         }
 
-        DN updn = entry.getDn();
+        Dn updn = entry.getDn();
 
         newRdn.normalize( schemaManager.getNormalizerMapping() );
 
         /*
          * H A N D L E   N E W   R D N
          * ====================================================================
-         * Add the new RDN attribute to the entry.  If an index exists on the
-         * new RDN attribute we add the index for this attribute value pair.
+         * Add the new Rdn attribute to the entry.  If an index exists on the
+         * new Rdn attribute we add the index for this attribute value pair.
          * Also we make sure that the presence index shows the existence of the
-         * new RDN attribute within this entry.
+         * new Rdn attribute within this entry.
          */
 
-        for ( AVA newAtav : newRdn )
+        for ( Ava newAtav : newRdn )
         {
             String newNormType = newAtav.getNormType();
             Object newNormValue = newAtav.getNormValue().get();
@@ -1215,31 +1215,31 @@ public abstract class AbstractStore<E, I
         /*
          * H A N D L E   O L D   R D N
          * ====================================================================
-         * If the old RDN is to be removed we need to get the attribute and
-         * value for it.  Keep in mind the old RDN need not be based on the
-         * same attr as the new one.  We remove the RDN value from the entry
-         * and remove the value/id tuple from the index on the old RDN attr
-         * if any.  We also test if the delete of the old RDN index tuple
-         * removed all the attribute values of the old RDN using a reverse
+         * If the old Rdn is to be removed we need to get the attribute and
+         * value for it.  Keep in mind the old Rdn need not be based on the
+         * same attr as the new one.  We remove the Rdn value from the entry
+         * and remove the value/id tuple from the index on the old Rdn attr
+         * if any.  We also test if the delete of the old Rdn index tuple
+         * removed all the attribute values of the old Rdn using a reverse
          * lookup.  If so that means we blew away the last value of the old
-         * RDN attribute.  In this case we need to remove the attrName/id
+         * Rdn attribute.  In this case we need to remove the attrName/id
          * tuple from the presence index.
          *
-         * We only remove an ATAV of the old RDN if it is not included in the
-         * new RDN.
+         * We only remove an ATAV of the old Rdn if it is not included in the
+         * new Rdn.
          */
 
         if ( deleteOldRdn )
         {
-            RDN oldRdn = updn.getRdn();
+            Rdn oldRdn = updn.getRdn();
 
-            for ( AVA oldAtav : oldRdn )
+            for ( Ava oldAtav : oldRdn )
             {
-                // check if the new ATAV is part of the old RDN
+                // check if the new ATAV is part of the old Rdn
                 // if that is the case we do not remove the ATAV
                 boolean mustRemove = true;
 
-                for ( AVA newAtav : newRdn )
+                for ( Ava newAtav : newRdn )
                 {
                     if ( oldAtav.equals( newAtav ) )
                     {
@@ -1277,8 +1277,8 @@ public abstract class AbstractStore<E, I
         /*
          * H A N D L E   D N   C H A N G E
          * ====================================================================
-         * We only need to update the RDN index.
-         * No need to calculate the new DN.
+         * We only need to update the Rdn index.
+         * No need to calculate the new Dn.
          */
 
         ID parentId = getParentId( id );
@@ -1298,7 +1298,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public synchronized void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception
     {
         rename( dn, newRdn, deleteOldRdn, null );
     }
@@ -1307,7 +1307,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized void moveAndRename( DN oldDn, DN newSuperiorDn, RDN newRdn, Entry modifiedEntry, boolean deleteOldRdn ) throws Exception
+    public synchronized void moveAndRename( Dn oldDn, Dn newSuperiorDn, Rdn newRdn, Entry modifiedEntry, boolean deleteOldRdn ) throws Exception
     {
     	// Check that the old entry exists
         ID oldId = getEntryId( oldDn );
@@ -1331,7 +1331,7 @@ public abstract class AbstractStore<E, I
             throw nse;
         }
 
-        DN newDn = newSuperiorDn.add( newRdn );
+        Dn newDn = newSuperiorDn.add( newRdn );
 
         // Now check that the new entry does not exist
         ID newId = getEntryId( newDn );
@@ -1358,7 +1358,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized void move( DN oldDn, DN newSuperiorDn, DN newDn  ) throws Exception
+    public synchronized void move( Dn oldDn, Dn newSuperiorDn, Dn newDn  ) throws Exception
     {
         move( oldDn, newSuperiorDn, newDn, null );
     }
@@ -1367,9 +1367,9 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    public synchronized void move( DN oldDn, DN newSuperiorDn, DN newDn, Entry modifiedEntry ) throws Exception
+    public synchronized void move( Dn oldDn, Dn newSuperiorDn, Dn newDn, Entry modifiedEntry ) throws Exception
     {
-        // Check that the parent DN exists
+        // Check that the parent Dn exists
         ID newParentId = getEntryId( newSuperiorDn );
 
         if ( newParentId == null )
@@ -1415,7 +1415,7 @@ public abstract class AbstractStore<E, I
 
         updateSubLevelIndex( entryId, oldParentId, newParentId );
 
-        // Update the RDN index
+        // Update the Rdn index
         rdnIdx.drop( entryId );
         ParentIdAndRdn<ID> key = new ParentIdAndRdn<ID>( newParentId, oldDn.getRdn() );
         rdnIdx.add( key, entryId );
@@ -1460,26 +1460,26 @@ public abstract class AbstractStore<E, I
     //------------------------------------------------------------------------
 
     /**
-     * builds the DN of the entry identified by the given id
+     * builds the Dn of the entry identified by the given id
      *
      * @param id the entry's id
-     * @return the normalized DN of the entry
+     * @return the normalized Dn of the entry
      * @throws Exception
      */
-    protected DN buildEntryDn( ID id ) throws Exception
+    protected Dn buildEntryDn( ID id ) throws Exception
     {
         ID parentId = id;
 
-        List<RDN> rdnList = new ArrayList<RDN>();
+        List<Rdn> rdnList = new ArrayList<Rdn>();
         String upName = "";
         String normName = "";
 
         do
         {
             ParentIdAndRdn<ID> cur = rdnIdx.reverseLookup( parentId );
-            RDN[] rdns = cur.getRdns();
+            Rdn[] rdns = cur.getRdns();
 
-            for ( RDN rdn : rdns )
+            for ( Rdn rdn : rdns )
             {
                 if ( rdnList.isEmpty() )
                 {
@@ -1499,7 +1499,7 @@ public abstract class AbstractStore<E, I
         }
         while ( !parentId.equals( getRootId() ) );
 
-        DN dn = new DN( upName, normName, Strings.getBytesUtf8(normName), rdnList );
+        Dn dn = new Dn( upName, normName, Strings.getBytesUtf8(normName), rdnList );
 
         return dn;
     }
@@ -1558,7 +1558,7 @@ public abstract class AbstractStore<E, I
 
         if ( modsOid.equals( SchemaConstants.ALIASED_OBJECT_NAME_AT_OID ) )
         {
-            DN ndn = getEntryDn( id );
+            Dn ndn = getEntryDn( id );
             addAliasIndices( id, ndn, mods.getString() );
         }
     }
@@ -1648,7 +1648,7 @@ public abstract class AbstractStore<E, I
 
         if ( modsOid.equals( aliasAttributeOid ) && mods.size() > 0 )
         {
-            DN entryDn = getEntryDn( id );
+            Dn entryDn = getEntryDn( id );
             addAliasIndices( id, entryDn, mods.getString() );
         }
     }
@@ -1777,15 +1777,15 @@ public abstract class AbstractStore<E, I
      * not allowed due to chaining or cycle formation.
      * @throws Exception if the wrappedCursor btrees cannot be altered
      */
-    protected void addAliasIndices( ID aliasId, DN aliasDn, String aliasTarget ) throws Exception
+    protected void addAliasIndices( ID aliasId, Dn aliasDn, String aliasTarget ) throws Exception
     {
-        DN normalizedAliasTargetDn; // Name value of aliasedObjectName
+        Dn normalizedAliasTargetDn; // Name value of aliasedObjectName
         ID targetId; // Id of the aliasedObjectName
-        DN ancestorDn; // Name of an alias entry relative
+        Dn ancestorDn; // Name of an alias entry relative
         ID ancestorId; // Id of an alias entry relative
 
         // Access aliasedObjectName, normalize it and generate the Name
-        normalizedAliasTargetDn = new DN( aliasTarget, schemaManager );
+        normalizedAliasTargetDn = new Dn( aliasTarget, schemaManager );
 
         /*
          * Check For Cycles
@@ -1880,7 +1880,7 @@ public abstract class AbstractStore<E, I
         ancestorId = getEntryId( ancestorDn );
 
         // check if alias parent and aliased entry are the same
-        DN normalizedAliasTargetParentDn = normalizedAliasTargetDn;
+        Dn normalizedAliasTargetParentDn = normalizedAliasTargetDn;
         normalizedAliasTargetParentDn = normalizedAliasTargetParentDn.remove( normalizedAliasTargetDn.size() - 1 );
 
         if ( !aliasDn.isChildOf( normalizedAliasTargetParentDn ) )
@@ -1923,7 +1923,7 @@ public abstract class AbstractStore<E, I
     protected void dropAliasIndices( ID aliasId ) throws Exception
     {
         String targetDn = aliasIdx.reverseLookup( aliasId );
-        ID targetId = getEntryId( new DN( targetDn, schemaManager ) );
+        ID targetId = getEntryId( new Dn( targetDn, schemaManager ) );
 
         if ( targetId == null )
         {
@@ -1932,10 +1932,10 @@ public abstract class AbstractStore<E, I
             return;
         }
 
-        DN aliasDN = getEntryDn( aliasId );
+        Dn aliasDn = getEntryDn( aliasId );
 
-        DN ancestorDn = aliasDN;
-        ancestorDn = ancestorDn.remove( aliasDN.size() - 1 );
+        Dn ancestorDn = aliasDn;
+        ancestorDn = ancestorDn.remove( aliasDn.size() - 1 );
         ID ancestorId = getEntryId( ancestorDn );
 
         /*
@@ -1973,7 +1973,7 @@ public abstract class AbstractStore<E, I
      * @param movedBase the base at which the move occured - the moved node
      * @throws Exception if system userIndices fail
      */
-    protected void dropMovedAliasIndices( final DN movedBase ) throws Exception
+    protected void dropMovedAliasIndices( final Dn movedBase ) throws Exception
     {
         ID movedBaseId = getEntryId( movedBase );
 
@@ -1992,17 +1992,17 @@ public abstract class AbstractStore<E, I
      * @param movedBase the base where the move occured
      * @throws Exception if userIndices fail
      */
-    protected void dropAliasIndices( ID aliasId, DN movedBase ) throws Exception
+    protected void dropAliasIndices( ID aliasId, Dn movedBase ) throws Exception
     {
         String targetDn = aliasIdx.reverseLookup( aliasId );
-        ID targetId = getEntryId( new DN( targetDn, schemaManager ) );
-        DN aliasDn = getEntryDn( aliasId );
+        ID targetId = getEntryId( new Dn( targetDn, schemaManager ) );
+        Dn aliasDn = getEntryDn( aliasId );
 
         /*
          * Start droping index tuples with the first ancestor right above the
          * moved base.  This is the first ancestor effected by the move.
          */
-        DN ancestorDn = movedBase.getPrefix( 1 );
+        Dn ancestorDn = movedBase.getPrefix( 1 );
         ID ancestorId = getEntryId( ancestorDn );
 
         /*
@@ -2049,7 +2049,7 @@ public abstract class AbstractStore<E, I
      * @param modifiedEntry the modified entry
      * @throws Exception if something goes wrong
      */
-    protected void moveAndRename( DN oldDn, ID childId, DN newSuperior, RDN newRdn, Entry modifiedEntry ) throws Exception
+    protected void moveAndRename( Dn oldDn, ID childId, Dn newSuperior, Rdn newRdn, Entry modifiedEntry ) throws Exception
     {
         // Get the child and the new parent to be entries and Ids
         ID newParentId = getEntryId( newSuperior );
@@ -2075,7 +2075,7 @@ public abstract class AbstractStore<E, I
         updateSubLevelIndex( childId, oldParentId, newParentId );
 
         /*
-         * Update the RDN index
+         * Update the Rdn index
          */
         rdnIdx.drop( childId );
         ParentIdAndRdn<ID> key = new ParentIdAndRdn<ID>( newParentId, newRdn );

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java Sun Jan 23 01:17:06 2011
@@ -27,13 +27,13 @@ import java.io.ObjectOutput;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
 
 
 /**
- * A wrapper for the tuple of parentId and RDN, used for the RDN index.
+ * A wrapper for the tuple of parentId and Rdn, used for the Rdn index.
  * 
- * If the refered entry is a ContextEntry, we may have more than one RDN stored
+ * If the refered entry is a ContextEntry, we may have more than one Rdn stored
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -42,8 +42,8 @@ public class ParentIdAndRdn<ID extends C
     /** The entry ID */
     protected ID parentId;
     
-    /** The list of RDN for this instance */
-    protected RDN[] rdns;
+    /** The list of Rdn for this instance */
+    protected Rdn[] rdns;
 
 
     /**
@@ -60,7 +60,7 @@ public class ParentIdAndRdn<ID extends C
      * @param parentId the parent ID
      * @param rdns the RDNs
      */
-    public ParentIdAndRdn( ID parentId, RDN... rdns )
+    public ParentIdAndRdn( ID parentId, Rdn... rdns )
     {
         this.parentId = parentId;
         this.rdns = rdns;
@@ -73,10 +73,10 @@ public class ParentIdAndRdn<ID extends C
      * @param parentId the parent ID
      * @param rdns the RDNs
      */
-    public ParentIdAndRdn( ID parentId, List<RDN> rdns )
+    public ParentIdAndRdn( ID parentId, List<Rdn> rdns )
     {
         this.parentId = parentId;
-        this.rdns = rdns.toArray( new RDN[rdns.size()] );
+        this.rdns = rdns.toArray( new Rdn[rdns.size()] );
     }
 
 
@@ -107,18 +107,18 @@ public class ParentIdAndRdn<ID extends C
      * 
      * @return the RDNs
      */
-    public RDN[] getRdns()
+    public Rdn[] getRdns()
     {
         return rdns;
     }
 
 
     /**
-     * Sets the RDN.
+     * Sets the Rdn.
      * 
-     * @param rdns the new RDN
+     * @param rdns the new Rdn
      */
-    public void setRdns( RDN[] rdns )
+    public void setRdns( Rdn[] rdns )
     {
         this.rdns = rdns;
     }
@@ -187,7 +187,7 @@ public class ParentIdAndRdn<ID extends C
         out.writeObject( parentId );
         out.writeInt( rdns.length );
 
-        for ( RDN rdn : rdns )
+        for ( Rdn rdn : rdns )
         {
             rdn.writeExternal( out );
         }
@@ -199,11 +199,11 @@ public class ParentIdAndRdn<ID extends C
     {
         parentId = ( ID ) in.readObject();
         int size = in.readInt();
-        rdns = new RDN[size];
+        rdns = new Rdn[size];
         
         for ( int i = 0; i < size; i++ )
         {
-            RDN rdn = new RDN();
+            Rdn rdn = new Rdn();
             rdn.readExternal( in );
             rdns[i] = rdn;
         }
@@ -222,7 +222,7 @@ public class ParentIdAndRdn<ID extends C
         
         boolean isFirst = true;
         
-        for ( RDN rdn : rdns )
+        for ( Rdn rdn : rdns )
         {
             if ( isFirst )
             {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * A comparator used to compare {@link ParentIdAndRdn} stored in the RDN index.
+ * A comparator used to compare {@link ParentIdAndRdn} stored in the Rdn index.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Sun Jan 23 01:17:06 2011
@@ -33,8 +33,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -143,19 +143,19 @@ public interface Store<E, ID extends Com
 
 
     /**
-     * Sets the suffix DN, must be normalized.
+     * Sets the suffix Dn, must be normalized.
      * 
-     * @param suffixDn the new suffix DN
+     * @param suffixDn the new suffix Dn
      */
-    void setSuffixDn( DN suffixDn );
+    void setSuffixDn( Dn suffixDn );
 
 
     /**
-     * Gets the suffix DN.
+     * Gets the suffix Dn.
      * 
-     * @return the suffix DN
+     * @return the suffix Dn
      */
-    DN getSuffixDn();
+    Dn getSuffixDn();
 
 
     /**
@@ -445,20 +445,20 @@ public interface Store<E, ID extends Com
 
 
     /**
-     * Gets the entry's id. Returns <code>null</code> if the DN doesn't exist in this store.
-     * Note that the DN must be normalized!
-     * @param dn the normalized entry DN
-     * @return the entry's id, or <code>null</code> if the DN doesn't exists
+     * Gets the entry's id. Returns <code>null</code> if the Dn doesn't exist in this store.
+     * Note that the Dn must be normalized!
+     * @param dn the normalized entry Dn
+     * @return the entry's id, or <code>null</code> if the Dn doesn't exists
      */
-    ID getEntryId( DN dn ) throws Exception;
+    ID getEntryId( Dn dn ) throws Exception;
 
 
     /**
-     * Gets the normalized DN of the entry identified by the given id.
+     * Gets the normalized Dn of the entry identified by the given id.
      * @param id the entry's id
-     * @return the normalized entry DN
+     * @return the normalized entry Dn
      */
-    DN getEntryDn( ID id ) throws Exception;
+    Dn getEntryDn( ID id ) throws Exception;
 
 
     /**
@@ -535,65 +535,65 @@ public interface Store<E, ID extends Com
     String getProperty( String propertyName ) throws Exception;
 
 
-    void modify( DN dn, ModificationOperation modOp, Entry mods ) throws Exception;
+    void modify( Dn dn, ModificationOperation modOp, Entry mods ) throws Exception;
 
 
     /**
      * Modify an entry applying the given list of modifications.
      *
-     * @param dn The Entry's DN
+     * @param dn The Entry's Dn
      * @param mods The list of modifications
      * @return The modified entry
      * @throws Exception If the modification failed
      */
-    Entry modify( DN dn, List<Modification> mods ) throws Exception;
+    Entry modify( Dn dn, List<Modification> mods ) throws Exception;
 
 
     /**
      * Changes the relative distinguished name of an entry specified by a
-     * distinguished name with the optional removal of the old RDN attribute
+     * distinguished name with the optional removal of the old Rdn attribute
      * value from the entry.  Name changes propagate down as dn changes to the
-     * descendants of the entry where the RDN changed.
+     * descendants of the entry where the Rdn changed.
      *
-     * An RDN change operation does not change parent child relationships.  It
-     * merely propagates a name change at a point in the DIT where the RDN is
+     * An Rdn change operation does not change parent child relationships.  It
+     * merely propagates a name change at a point in the DIT where the Rdn is
      * changed. The change propagates down the subtree rooted at the
      * distinguished name specified.
      *
      * @param dn the normalized distinguished name of the entry to alter
-     * @param newRdn the new RDN to set
-     * @param deleteOldRdn whether or not to remove the old RDN attr/val
+     * @param newRdn the new Rdn to set
+     * @param deleteOldRdn whether or not to remove the old Rdn attr/val
      * @param entry the modified entry
      * @throws Exception if there are any errors propagating the name changes
      */
-    void rename( DN dn, RDN newRdn, boolean deleteOldRdn, Entry entry ) throws Exception;
+    void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, Entry entry ) throws Exception;
 
 
     /**
      * Changes the relative distinguished name of an entry specified by a
-     * distinguished name with the optional removal of the old RDN attribute
+     * distinguished name with the optional removal of the old Rdn attribute
      * value from the entry.  Name changes propagate down as dn changes to the
-     * descendants of the entry where the RDN changed.
+     * descendants of the entry where the Rdn changed.
      *
-     * An RDN change operation does not change parent child relationships.  It
-     * merely propagates a name change at a point in the DIT where the RDN is
+     * An Rdn change operation does not change parent child relationships.  It
+     * merely propagates a name change at a point in the DIT where the Rdn is
      * changed. The change propagates down the subtree rooted at the
      * distinguished name specified.
      *
      * @param dn the normalized distinguished name of the entry to alter
-     * @param newRdn the new RDN to set
-     * @param deleteOldRdn whether or not to remove the old RDN attr/val
+     * @param newRdn the new Rdn to set
+     * @param deleteOldRdn whether or not to remove the old Rdn attr/val
      * @throws Exception if there are any errors propagating the name changes
      */
-    void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
+    void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn ) throws Exception;
 
     
-    void moveAndRename( DN oldChildDn, DN newParentDn, RDN newRdn, Entry entry, boolean deleteOldRdn ) throws Exception;
+    void moveAndRename( Dn oldChildDn, Dn newParentDn, Rdn newRdn, Entry entry, boolean deleteOldRdn ) throws Exception;
 
 
     /**
-     * <p>Move an entry from one place to the other. The RDN remains unchanged,
-     * the parent DN changes</p>
+     * <p>Move an entry from one place to the other. The Rdn remains unchanged,
+     * the parent Dn changes</p>
      * <p>We have to update some of the index when moving an entry. Assuming
      * that the target destination does not exist, the following index must
      * be updated :</p>
@@ -615,17 +615,17 @@ public interface Store<E, ID extends Com
      * <li>The moved entry must not inherit from a referral (already checked)
      * </ul>
      *
-     * @param oldDn The previous entry DN
-     * @param newSuperior The new superior DN
-     * @param newDn The new DN
+     * @param oldDn The previous entry Dn
+     * @param newSuperior The new superior Dn
+     * @param newDn The new Dn
      * @throws Exception If the move failed
      */
-    void move( DN oldDn, DN newSuperior, DN newDn ) throws Exception;
+    void move( Dn oldDn, Dn newSuperior, Dn newDn ) throws Exception;
 
 
     /**
-     * <p>Move an entry from one place to the other. The RDN remains unchanged,
-     * the parent DN changes</p>
+     * <p>Move an entry from one place to the other. The Rdn remains unchanged,
+     * the parent Dn changes</p>
      * <p>We have to update some of the index when moving an entry. Assuming
      * that the target destination does not exist, the following index must
      * be updated :</p>
@@ -647,13 +647,13 @@ public interface Store<E, ID extends Com
      * <li>The moved entry must not inherit from a referral (already checked)
      * </ul>
      *
-     * @param oldDn The previous entry DN
-     * @param newSuperior The new superior DN
-     * @param newDn The new DN
+     * @param oldDn The previous entry Dn
+     * @param newSuperior The new superior Dn
+     * @param newDn The new Dn
      * @param entry The entry to move
      * @throws Exception If the move failed
      */
-    void move( DN oldDn, DN newSuperior, DN newDn, Entry entry ) throws Exception;
+    void move( Dn oldDn, Dn newSuperior, Dn newDn, Entry entry ) throws Exception;
 
 
     /**

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

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.server.xdbm.IndexCursor;
 
 import javax.naming.directory.SearchControls;
@@ -83,7 +83,7 @@ public interface SearchEngine<E, ID>
      * @return enumeration over SearchResults
      * @throws Exception if the search fails
      */
-    IndexCursor<ID, E, ID> cursor( DN base, AliasDerefMode aliasDerefMode, ExprNode filter,
+    IndexCursor<ID, E, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
         SearchControls searchCtls ) throws Exception;
 
 

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Sun Jan 23 01:17:06 2011
@@ -291,7 +291,7 @@ public class DefaultOptimizer<E, ID exte
      *
      * @param node the greater or less than node to get a count for 
      * @param isGreaterThan if true test is for >=, otherwise <=
-     * @return the scan count of all nodes satisfying the AVA
+     * @return the scan count of all nodes satisfying the Ava
      * @throws Exception if there is an error accessing an index
      */
     @SuppressWarnings("unchecked")

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -95,12 +95,12 @@ public class DefaultSearchEngine<ID exte
 
 
     /**
-     * @see SearchEngine#cursor(DN, AliasDerefMode, ExprNode, SearchControls)
+     * @see SearchEngine#cursor(org.apache.directory.shared.ldap.name.Dn, AliasDerefMode, ExprNode, SearchControls)
      */
-    public IndexCursor<ID, Entry, ID> cursor( DN base, AliasDerefMode aliasDerefMode, ExprNode filter,
+    public IndexCursor<ID, Entry, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
         SearchControls searchCtls ) throws Exception
     {
-        DN effectiveBase;
+        Dn effectiveBase;
         ID baseId = db.getEntryId( base );
 
         // Check that we have an entry, otherwise we can immediately get out
@@ -141,7 +141,7 @@ public class DefaultSearchEngine<ID exte
          */
         else
         {
-            effectiveBase = new DN( aliasedBase );
+            effectiveBase = new Dn( aliasedBase );
         }
 
         // --------------------------------------------------------------------

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -71,7 +71,7 @@ public class AbstractStoreTest
     private static File wkdir;
     private static Store<Entry, Long> store;
     private static SchemaManager schemaManager = null;
-    private static DN EXAMPLE_COM;
+    private static Dn EXAMPLE_COM;
     
     /** The OU AttributType instance */
     private static AttributeType OU_AT;
@@ -109,7 +109,7 @@ public class AbstractStoreTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        EXAMPLE_COM = new DN( "dc=example,dc=com", schemaManager );
+        EXAMPLE_COM = new Dn( "dc=example,dc=com", schemaManager );
         
         OU_AT = schemaManager.getAttributeType( SchemaConstants.OU_AT );
         CN_AT = schemaManager.getAttributeType( SchemaConstants.CN_AT );
@@ -167,7 +167,7 @@ public class AbstractStoreTest
     @Test
     public void testModifyAddObjectClass() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
@@ -200,7 +200,7 @@ public class AbstractStoreTest
     @Test
     public void testModifyRemoveIndexedAttribute() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
@@ -234,7 +234,7 @@ public class AbstractStoreTest
     @Test
     public void testModifyRemoveAllIndexedAttribute() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
@@ -267,7 +267,7 @@ public class AbstractStoreTest
     @Test
     public void testModifyRemoveObjectClass() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
@@ -300,7 +300,7 @@ public class AbstractStoreTest
     @Test
     public void testModifyRemoveAllObjectClass() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
@@ -329,7 +329,7 @@ public class AbstractStoreTest
     @Test
     public void testCheckCsnIndexUpdate() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         AttributeType csnAt = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.ENTRY_CSN_AT );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -50,7 +50,7 @@ public class StoreUtils
      * Structure and Organization</a>
      *
      * TODO might want to make this load an LDIF instead in the future
-     * TODO correct size of spaces in user provided DN
+     * TODO correct size of spaces in user provided Dn
      * 
      * @param store the store object to be initialized
      * @param registries oid registries
@@ -60,7 +60,7 @@ public class StoreUtils
     @SuppressWarnings("PMD.AvoidUsingHardCodedIP")
     public static void loadExampleData( Store<Entry, Long> store, SchemaManager schemaManager ) throws Exception
     {
-        DN suffixDn = new DN( "o=Good Times Co.", schemaManager );
+        Dn suffixDn = new Dn( "o=Good Times Co.", schemaManager );
         store.setSuffixDn( suffixDn );
 
         store.init( schemaManager );
@@ -74,7 +74,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #2
-        DN dn = new DN( "ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Sales" );
@@ -83,7 +83,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #3
-        dn = new DN( "ou=Board of Directors,o=Good Times Co.", schemaManager );
+        dn = new Dn( "ou=Board of Directors,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Board of Directors" );
@@ -92,7 +92,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #4
-        dn = new DN( "ou=Engineering,o=Good Times Co.", schemaManager );
+        dn = new Dn( "ou=Engineering,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Engineering" );
@@ -101,7 +101,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #5
-        dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Sales" );
@@ -112,7 +112,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #6
-        dn = new DN( "cn=JIM BEAN,ou=Sales,o=Good Times Co.", schemaManager );
+        dn = new Dn( "cn=JIM BEAN,ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Sales" );
@@ -123,7 +123,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #7
-        dn = new DN( "ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        dn = new Dn( "ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Apache" );
@@ -132,7 +132,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #8
-        dn = new DN( "cn=Jack Daniels,ou=Engineering,o=Good Times Co.", schemaManager );
+        dn = new Dn( "cn=Jack Daniels,ou=Engineering,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
@@ -145,7 +145,7 @@ public class StoreUtils
         // aliases -------------
 
         // Entry #9
-        dn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        dn = new Dn( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "ou", "Apache" );
@@ -154,7 +154,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #10
-        dn = new DN( "commonName=Jim Bean,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        dn = new Dn( "commonName=Jim Bean,ou=Board of Directors,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "commonName", "Jim Bean" );
@@ -162,7 +162,7 @@ public class StoreUtils
         injectEntryInStore( store, entry );
 
         // Entry #11
-        dn = new DN( "2.5.4.3=Johnny Walker,ou=Engineering,o=Good Times Co.", schemaManager );
+        dn = new Dn( "2.5.4.3=Johnny Walker,ou=Engineering,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "ou", "Engineering" );
@@ -270,7 +270,7 @@ public class StoreUtils
      * attributes
      *
      * @param store the store
-     * @param dn the normalized DN
+     * @param dn the normalized Dn
      * @param entry the server entry
      * @throws Exception in case of any problems in adding the entry to the store
      */

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Sun Jan 23 01:17:06 2011
@@ -34,7 +34,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
 import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -195,13 +195,13 @@ public class AvlRdnIndexTest
         initIndex();
         assertEquals( 0, idx.count() );
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         idx.add( key, 0l );
         assertEquals( 1, idx.count() );
 
         // setting a different parentId should make this key a different key
-        key = new ParentIdAndRdn<Long>( 1L, new RDN( "cn=key" ) );
+        key = new ParentIdAndRdn<Long>( 1L, new Rdn( "cn=key" ) );
 
         idx.add( key, 1l );
         assertEquals( 2, idx.count() );
@@ -210,7 +210,7 @@ public class AvlRdnIndexTest
         idx.add( key, 2l );
         assertEquals( 2, idx.count() );
 
-        key = new ParentIdAndRdn<Long>( 2L, new RDN( "cn=key" ) );
+        key = new ParentIdAndRdn<Long>( 2L, new Rdn( "cn=key" ) );
         idx.add( key, 3l );
         assertEquals( 3, idx.count() );
     }
@@ -221,7 +221,7 @@ public class AvlRdnIndexTest
     {
         initIndex();
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         assertEquals( 0, idx.count( key ) );
 
@@ -239,7 +239,7 @@ public class AvlRdnIndexTest
     {
         initIndex();
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         assertNull( idx.forwardLookup( key ) );
 
@@ -254,7 +254,7 @@ public class AvlRdnIndexTest
     {
         initIndex();
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         assertNull( idx.forwardLookup( key ) );
 
@@ -277,7 +277,7 @@ public class AvlRdnIndexTest
     {
         initIndex();
 
-        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new RDN( "cn=key" ) );
+        ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key" ) );
 
         assertEquals( 0, idx.count() );
 
@@ -286,7 +286,7 @@ public class AvlRdnIndexTest
 
         for ( long i = 1; i < 5; i++ )
         {
-            key = new ParentIdAndRdn<Long>( i, new RDN( "cn=key" + i ) );
+            key = new ParentIdAndRdn<Long>( i, new Rdn( "cn=key" + i ) );
 
             idx.add( key, ( long ) i );
         }
@@ -321,14 +321,14 @@ public class AvlRdnIndexTest
     //    {
     //        initIndex();
     //        
-    //        DN dn = new DN( "dc=example,dc=com" );
+    //        Dn dn = new Dn( "dc=example,dc=com" );
     //        dn.normalize( schemaManager.getNormalizerMapping() );
     //        
-    //        RDN rdn = new RDN( dn.getName() );
+    //        Rdn rdn = new Rdn( dn.getName() );
     //        rdn._setParentId( 1 );
     //        idx.add( rdn, 0l );
     //        
-    //        RDN rdn2 = idx.reverseLookup( 0l );
+    //        Rdn rdn2 = idx.reverseLookup( 0l );
     //        System.out.println( rdn2 );
     //        InternalRdnComparator rdnCom = new InternalRdnComparator( "" );
     //        assertEquals( 0, rdnCom.compare( rdn, rdn2 ) );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Sun Jan 23 01:17:06 2011
@@ -55,8 +55,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -85,7 +85,7 @@ public class AvlStoreTest
     private static File wkdir;
     private static AvlStore<Entry> store;
     private static SchemaManager schemaManager = null;
-    private static DN EXAMPLE_COM;
+    private static Dn EXAMPLE_COM;
 
     /** The OU AttributeType instance */
     private static AttributeType OU_AT;
@@ -123,7 +123,7 @@ public class AvlStoreTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        EXAMPLE_COM = new DN( "dc=example,dc=com", schemaManager );
+        EXAMPLE_COM = new Dn( "dc=example,dc=com", schemaManager );
 
         OU_AT = schemaManager.getAttributeType( SchemaConstants.OU_AT );
         DC_AT = schemaManager.getAttributeType( SchemaConstants.DC_AT );
@@ -402,7 +402,7 @@ public class AvlStoreTest
     @Test
     public void testFreshStore() throws Exception
     {
-        DN dn = new DN( "o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "o=Good Times Co.", schemaManager );
         assertEquals( 1L, ( long ) store.getEntryId( dn ) );
         assertEquals( 11, store.count() );
 
@@ -433,7 +433,7 @@ public class AvlStoreTest
         assertEquals( 10, store.count() );
 
         // add an alias and delete to test dropAliasIndices method
-        DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
         entry.add( "ou", "Apache" );
@@ -481,7 +481,7 @@ public class AvlStoreTest
         assertFalse( cursor.next() );
 
         // dn id 12
-        DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn martinDn = new Dn( "cn=Marting King,ou=Sales,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, martinDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Sales" );
@@ -495,9 +495,9 @@ public class AvlStoreTest
         assertTrue( cursor.previous() );
         assertEquals( 12, ( long ) cursor.get().getId() );
 
-        DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co.", schemaManager );
+        Dn newParentDn = new Dn( "ou=Board of Directors,o=Good Times Co.", schemaManager );
 
-        DN newDn = newParentDn.add( martinDn.getRdn() );
+        Dn newDn = newParentDn.add( martinDn.getRdn() );
         store.move( martinDn, newParentDn, newDn, new ClonedServerEntry( entry ) );
 
         cursor = idx.forwardCursor( 3L );
@@ -506,7 +506,7 @@ public class AvlStoreTest
         assertEquals( 12, ( long ) cursor.get().getId() );
 
         // dn id 13
-        DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn marketingDn = new Dn( "ou=Marketing,ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, marketingDn );
         entry.add( "objectClass", "top", "organizationalUnit" );
         entry.add( "ou", "Marketing" );
@@ -515,7 +515,7 @@ public class AvlStoreTest
         store.add( entry );
 
         // dn id 14
-        DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co.", schemaManager );
+        Dn jimmyDn = new Dn( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co.", schemaManager );
         entry = new DefaultEntry( schemaManager, jimmyDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Marketing" );
@@ -572,7 +572,7 @@ public class AvlStoreTest
     @Test(expected = LdapNoSuchObjectException.class)
     public void testAddWithoutParentId() throws Exception
     {
-        DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Marting King,ou=Not Present,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Not Present" );
@@ -584,7 +584,7 @@ public class AvlStoreTest
     @Test(expected = LdapSchemaViolationException.class)
     public void testAddWithoutObjectClass() throws Exception
     {
-        DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Martin King,ou=Sales,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "ou", "Sales" );
         entry.add( "cn", "Martin King" );
@@ -595,7 +595,7 @@ public class AvlStoreTest
     @Test
     public void testModifyAddOUAttrib() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OU_AT, OU_AT );
@@ -612,7 +612,7 @@ public class AvlStoreTest
     @Test
     public void testRename() throws Exception
     {
-        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
@@ -622,7 +622,7 @@ public class AvlStoreTest
 
         store.add( entry );
 
-        RDN rdn = new RDN( "sn=James" );
+        Rdn rdn = new Rdn( "sn=James" );
 
         store.rename( dn, rdn, true );
     }
@@ -631,7 +631,7 @@ public class AvlStoreTest
     @Test
     public void testRenameEscaped() throws Exception
     {
-        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "ou", "Engineering" );
@@ -641,11 +641,11 @@ public class AvlStoreTest
 
         store.add( entry );
 
-        RDN rdn = new RDN( "sn=Ja\\+es" );
+        Rdn rdn = new Rdn( "sn=Ja\\+es" );
 
         store.rename( dn, rdn, true );
 
-        DN dn2 = new DN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn dn2 = new Dn( "sn=Ja\\+es,ou=Engineering,o=Good Times Co.", schemaManager );
         Long id = store.getEntryId( dn2 );
         assertNotNull( id );
         Entry entry2 = store.lookup( id );
@@ -656,7 +656,7 @@ public class AvlStoreTest
     @Test
     public void testMove() throws Exception
     {
-        DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
+        Dn childDn = new Dn( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co.", schemaManager );
         DefaultEntry childEntry = new DefaultEntry( schemaManager, childDn );
         childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
         childEntry.add( "ou", "Engineering" );
@@ -666,20 +666,20 @@ public class AvlStoreTest
 
         store.add( childEntry );
 
-        DN parentDn = new DN( "ou=Sales,o=Good Times Co.", schemaManager );
+        Dn parentDn = new Dn( "ou=Sales,o=Good Times Co.", schemaManager );
 
-        RDN rdn = new RDN( "cn=Ryan" );
+        Rdn rdn = new Rdn( "cn=Ryan" );
 
         store.moveAndRename( childDn, parentDn, rdn, new ClonedServerEntry( childEntry ), true );
 
         // to drop the alias indices   
-        childDn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
+        childDn = new Dn( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
 
-        parentDn = new DN( "ou=Engineering,o=Good Times Co.", schemaManager );
+        parentDn = new Dn( "ou=Engineering,o=Good Times Co.", schemaManager );
 
         assertEquals( 3, store.getSubAliasIndex().count() );
 
-        DN newDn = parentDn.add( childDn.getRdn() );
+        Dn newDn = parentDn.add( childDn.getRdn() );
         store.move( childDn, parentDn, newDn, childEntry );
 
         assertEquals( 4, store.getSubAliasIndex().count() );
@@ -689,7 +689,7 @@ public class AvlStoreTest
     @Test
     public void testModifyAdd() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SURNAME_AT, schemaManager
@@ -720,7 +720,7 @@ public class AvlStoreTest
     @Test
     public void testModifyReplace() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
@@ -752,7 +752,7 @@ public class AvlStoreTest
     @Test
     public void testModifyRemove() throws Exception
     {
-        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co.", schemaManager );
 
         List<Modification> mods = new ArrayList<Modification>();
         EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.SN_AT, schemaManager
@@ -784,7 +784,7 @@ public class AvlStoreTest
     @Test
     public void testModifyReplaceNonExistingIndexAttribute() throws Exception
     {
-        DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co.", schemaManager );
+        Dn dn = new Dn( "cn=Tim B,ou=Sales,o=Good Times Co.", schemaManager );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
         entry.add( "cn", "Tim B" );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
-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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -605,7 +605,7 @@ public class GreaterEqTest
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        DN dn = new DN( "cn=jane doe,o=good times co.", schemaManager );
+        Dn dn = new Dn( "cn=jane doe,o=good times co.", schemaManager );
         Entry attrs = new DefaultEntry( schemaManager, dn );
         attrs.add( "objectClass", "person" );
         attrs.add( "c-street", "3" );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.StringValue;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
-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.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -631,7 +631,7 @@ public class LessEqTest
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        DN dn = new DN( "cn=jane doe,o=good times co.", schemaManager );
+        Dn dn = new Dn( "cn=jane doe,o=good times co.", schemaManager );
         Entry attrs = new DefaultEntry( schemaManager, dn );
         attrs.add( "objectClass", "person" );
         attrs.add( "c-street", "1" );

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -154,7 +154,7 @@ public class OneLevelScopeTest
     @Test
     public void testCursorNoDeref() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -300,7 +300,7 @@ public class OneLevelScopeTest
     @Test
     public void testCursorNoDerefReturnAliases() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -446,7 +446,7 @@ public class OneLevelScopeTest
     @Test
     public void testCursorWithDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -570,7 +570,7 @@ public class OneLevelScopeTest
     @Test
     public void testCursorWithDereferencing2() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=apache," + SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
             + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
@@ -660,7 +660,7 @@ public class OneLevelScopeTest
     @Test
     public void testCursorWithDereferencing3() throws Exception
     {
-        DN dn = new DN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID + "=board of directors,"
+        Dn dn = new Dn( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID + "=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co.", schemaManager );
 
         Entry attrs = new DefaultEntry( schemaManager, dn );
@@ -671,7 +671,7 @@ public class OneLevelScopeTest
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        dn = new DN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board of directors,"
+        dn = new Dn( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co.", schemaManager );
 
         attrs = new DefaultEntry( schemaManager, dn );
@@ -682,7 +682,7 @@ public class OneLevelScopeTest
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -912,7 +912,7 @@ public class OneLevelScopeTest
     @Test
     public void testEvaluatorNoDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -926,7 +926,7 @@ public class OneLevelScopeTest
     @Test
     public void testEvaluatorWithDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -958,7 +958,7 @@ public class OneLevelScopeTest
     @Test(expected = InvalidCursorPositionException.class)
     public void testInvalidCursorPositionException() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -970,7 +970,7 @@ public class OneLevelScopeTest
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportBeforeWithoutIndex() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -986,7 +986,7 @@ public class OneLevelScopeTest
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportAfterWithoutIndex() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         OneLevelScopeEvaluator<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry, Long>( store,
             node );
@@ -1002,7 +1002,7 @@ public class OneLevelScopeTest
     @Test(expected = IllegalStateException.class)
     public void testIllegalStateBadScope() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         new OneLevelScopeEvaluator<Entry, Long>( store, node );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -154,7 +154,7 @@ public class SubtreeScopeTest
     @Test
     public void testCursorNoDeref() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -312,7 +312,7 @@ public class SubtreeScopeTest
     @Test
     public void testCursorWithDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -499,7 +499,7 @@ public class SubtreeScopeTest
     @Test
     public void testCursorWithDereferencing2() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=apache," + SchemaConstants.OU_AT_OID + "=board of directors," + SchemaConstants.O_AT_OID
             + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
@@ -623,7 +623,7 @@ public class SubtreeScopeTest
     @Test
     public void testCursorWithDereferencing3() throws Exception
     {
-        DN dn = new DN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID + "=board of directors,"
+        Dn dn = new Dn( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID + "=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co.", schemaManager );
 
         Entry attrs = new DefaultEntry( schemaManager, dn );
@@ -634,7 +634,7 @@ public class SubtreeScopeTest
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        dn = new DN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board of directors,"
+        dn = new Dn( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co.", schemaManager );
 
         attrs = new DefaultEntry( schemaManager, dn );
@@ -645,7 +645,7 @@ public class SubtreeScopeTest
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING, new Dn( SchemaConstants.OU_AT_OID
             + "=board of directors," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -910,7 +910,7 @@ public class SubtreeScopeTest
     @Test
     public void testEvaluatorNoDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
 
@@ -923,7 +923,7 @@ public class SubtreeScopeTest
     @Test
     public void testEvaluatorWithDereferencing() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_ALWAYS, new Dn( SchemaConstants.OU_AT_OID
             + "=engineering," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         assertEquals( node, evaluator.getExpression() );
@@ -949,7 +949,7 @@ public class SubtreeScopeTest
     @Test(expected = InvalidCursorPositionException.class)
     public void testInvalidCursorPositionException() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -960,7 +960,7 @@ public class SubtreeScopeTest
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportBeforeWithoutIndex() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -975,7 +975,7 @@ public class SubtreeScopeTest
     @Test(expected = UnsupportedOperationException.class)
     public void testUnsupportAfterWithoutIndex() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store, evaluator );
@@ -990,7 +990,7 @@ public class SubtreeScopeTest
     @Test(expected = IllegalStateException.class)
     public void testIllegalStateBadScope() throws Exception
     {
-        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new DN( SchemaConstants.OU_AT_OID
+        ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, new Dn( SchemaConstants.OU_AT_OID
             + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.ONELEVEL );
         SubtreeScopeEvaluator<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry, Long>( store, node );
         assertNull( evaluator );

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -194,7 +194,7 @@ public class EntryNode implements TreeNo
 
         try
         {
-            DN dn = partition.getEntryDn( id );
+            Dn dn = partition.getEntryDn( id );
             buf.append( "(" ).append( id ).append( ") " );
             buf.append( dn.getRdn() );
         }



Mime
View raw message