You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/23 02:17:26 UTC
svn commit: r1062306 [11/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...

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryCache.java Sun Jan 23 01:17:06 2011
@@ -25,18 +25,18 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
- * A cache for subtree specifications. It associates a Subentry with a DN,
+ * A cache for subtree specifications. It associates a Subentry with a Dn,
  * representing its position in the DIT.<br>
  * This cache has a size limit set to 1000 at the moment. We should add a configuration
  * parameter to manage its size.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SubentryCache implements Iterable<DN>
+public class SubentryCache implements Iterable<Dn>
 {
     /** The default cache size limit */
     private static final int DEFAULT_CACHE_MAX_SIZE = 1000;
@@ -48,14 +48,14 @@ public class SubentryCache implements It
     private AtomicInteger cacheSize;
     
     /** The Subentry cache */
-    private final Map<DN, Subentry> cache;
+    private final Map<Dn, Subentry> cache;
     
     /**
      * Creates a new instance of SubentryCache with a default maximum size.
      */
     public SubentryCache()
     {
-        cache = new ConcurrentHashMap<DN, Subentry>();
+        cache = new ConcurrentHashMap<Dn, Subentry>();
         cacheSize = new AtomicInteger( 0 );
     }
     
@@ -65,32 +65,32 @@ public class SubentryCache implements It
      */
     public SubentryCache( int maxSize )
     {
-        cache = new ConcurrentHashMap<DN, Subentry>();
+        cache = new ConcurrentHashMap<Dn, Subentry>();
         cacheSize = new AtomicInteger( 0 );
         cacheMaxSize = maxSize;
     }
     
     
     /**
-     * Retrieve a Subentry given a DN. If there is none, null will be returned.
+     * Retrieve a Subentry given a Dn. If there is none, null will be returned.
      *
-     * @param dn The DN we want to get the Subentry for 
+     * @param dn The Dn we want to get the Subentry for
      * @return The found Subentry, or null
      */
-    final Subentry getSubentry( DN dn )
+    final Subentry getSubentry( Dn dn )
     {
         return cache.get( dn );
     }
     
     
     /**
-     * Remove a Subentry for a given DN 
+     * Remove a Subentry for a given Dn
      *
-     * @param dn The DN for which we want to remove the 
+     * @param dn The Dn for which we want to remove the
      * associated Subentry
      * @return The removed Subentry, if any
      */
-    final Subentry removeSubentry( DN dn )
+    final Subentry removeSubentry( Dn dn )
     {
         Subentry oldSubentry = cache.remove( dn );
         
@@ -104,14 +104,14 @@ public class SubentryCache implements It
     
     
     /**
-     * Stores a new Subentry into the cache, associated with a DN
+     * Stores a new Subentry into the cache, associated with a Dn
      *
-     * @param dn The Subentry DN
+     * @param dn The Subentry Dn
      * @param ss The SubtreeSpecification
      * @param adminRoles The administrative roles for this Subentry
      * @return The old Subentry, if any
      */
-    /* No qualifier */ Subentry addSubentry( DN dn, Subentry subentry )
+    /* No qualifier */ Subentry addSubentry( Dn dn, Subentry subentry )
     {
         if ( cacheSize.get() > cacheMaxSize )
         {
@@ -130,11 +130,11 @@ public class SubentryCache implements It
     
     
     /**
-     * Tells if there is a Subentry associated with a DN
-     * @param dn The DN
+     * Tells if there is a Subentry associated with a Dn
+     * @param dn The Dn
      * @return True if a Subentry is found
      */
-    /* No qualifier */ boolean hasSubentry( DN dn )
+    /* No qualifier */ boolean hasSubentry( Dn dn )
     {
         return cache.containsKey( dn );
     }
@@ -143,7 +143,7 @@ public class SubentryCache implements It
     /**
      * @return An Iterator over the Subentry's DNs 
      */
-    public Iterator<DN> iterator()
+    public Iterator<Dn> iterator()
     {
         return cache.keySet().iterator();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sun Jan 23 01:17:06 2011
@@ -76,7 +76,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-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.subtree.AdministrativeRole;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
@@ -102,7 +102,7 @@ public class SubentryInterceptor extends
     /** The set of Subentry operational attributes */
     public static AttributeType[] SUBENTRY_OPATTRS;
 
-    /** the hash mapping the DN of a subentry to its SubtreeSpecification/types */
+    /** the hash mapping the Dn of a subentry to its SubtreeSpecification/types */
     private final SubentryCache subentryCache = new SubentryCache();
 
     /** The SubTree specification parser instance */
@@ -199,12 +199,12 @@ public class SubentryInterceptor extends
         controls.setReturningAttributes( new String[]
             { SchemaConstants.SUBTREE_SPECIFICATION_AT, SchemaConstants.OBJECT_CLASS_AT } );
 
-        DN adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
+        Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN );
 
         // search each namingContext for subentries
         for ( String suffix : suffixes )
         {
-            DN suffixDn = directoryService.getDNFactory().create( suffix );
+            Dn suffixDn = directoryService.getDNFactory().create( suffix );
 
             CoreSession adminSession = new DefaultCoreSession(
                 new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
@@ -222,7 +222,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry subentry = subentries.get();
-                    DN subentryDn = subentry.getDn();
+                    Dn subentryDn = subentry.getDn();
 
                     String subtree = subentry.get( SUBTREE_SPECIFICATION_AT ).getString();
                     SubtreeSpecification ss;
@@ -325,7 +325,7 @@ public class SubentryInterceptor extends
     /**
      * Update all the entries under an AP adding the
      */
-    private void updateEntries( OperationEnum operation, CoreSession session, DN subentryDn, DN apDn, SubtreeSpecification ss, DN baseDn, List<EntryAttribute> operationalAttributes  ) throws LdapException
+    private void updateEntries( OperationEnum operation, CoreSession session, Dn subentryDn, Dn apDn, SubtreeSpecification ss, Dn baseDn, List<EntryAttribute> operationalAttributes  ) throws LdapException
     {
         ExprNode filter = new PresenceNode( OBJECT_CLASS_AT ); // (objectClass=*)
         SearchControls controls = new SearchControls();
@@ -344,7 +344,7 @@ public class SubentryInterceptor extends
             while ( subentries.next() )
             {
                 Entry candidate = subentries.get();
-                DN candidateDn = candidate.getDn();
+                Dn candidateDn = candidate.getDn();
 
                 if ( evaluator.evaluate( ss, apDn, candidateDn, candidate ) )
                 {
@@ -380,11 +380,11 @@ public class SubentryInterceptor extends
 
 
     /**
-     * Checks if the given DN is a namingContext
+     * Checks if the given Dn is a namingContext
      */
-    private boolean isNamingContext( DN dn ) throws LdapException
+    private boolean isNamingContext( Dn dn ) throws LdapException
     {
-        DN namingContext = nexus.findSuffix( dn );
+        Dn namingContext = nexus.findSuffix( dn );
 
         return dn.equals( namingContext );
     }
@@ -393,7 +393,7 @@ public class SubentryInterceptor extends
     /**
      * Get the administrativePoint role
      */
-    private void checkAdministrativeRole( OperationContext opContext, DN apDn ) throws LdapException
+    private void checkAdministrativeRole( OperationContext opContext, Dn apDn ) throws LdapException
     {
         Entry administrationPoint = opContext.lookup( apDn, ByPassConstants.LOOKUP_BYPASS );
 
@@ -441,7 +441,7 @@ public class SubentryInterceptor extends
      * are, false otherwise
      * @throws Exception if there are errors while searching the directory
      */
-    private boolean hasAdministrativeDescendant( OperationContext opContext, DN name ) throws LdapException
+    private boolean hasAdministrativeDescendant( OperationContext opContext, Dn name ) throws LdapException
     {
         ExprNode filter = new PresenceNode( ADMINISTRATIVE_ROLE_AT );
         SearchControls controls = new SearchControls();
@@ -471,7 +471,7 @@ public class SubentryInterceptor extends
     }
 
 
-    private List<Modification> getModsOnEntryRdnChange( DN oldName, DN newName, Entry entry ) throws LdapException
+    private List<Modification> getModsOnEntryRdnChange( Dn oldName, Dn newName, Entry entry ) throws LdapException
     {
         List<Modification> modifications = new ArrayList<Modification>();
 
@@ -488,9 +488,9 @@ public class SubentryInterceptor extends
          * would be caused by chop exclusions. In this case we must add subentry
          * operational attribute values with the dn of this subentry.
          */
-        for ( DN subentryDn : subentryCache )
+        for ( Dn subentryDn : subentryCache )
         {
-            DN apDn = subentryDn.getParent();
+            Dn apDn = subentryDn.getParent();
             SubtreeSpecification ss = subentryCache.getSubentry( subentryDn ).getSubtreeSpecification();
             boolean isOldNameSelected = evaluator.evaluate( ss, apDn, oldName, entry );
             boolean isNewNameSelected = evaluator.evaluate( ss, apDn, newName, entry );
@@ -577,7 +577,7 @@ public class SubentryInterceptor extends
             }
         }
 
-        Entry attrs = new DefaultEntry( schemaManager, DN.EMPTY_DN );
+        Entry attrs = new DefaultEntry( schemaManager, Dn.EMPTY_DN );
         attrs.put( ocFinalState );
         return getSubentryAdminRoles( attrs );
     }
@@ -587,7 +587,7 @@ public class SubentryInterceptor extends
      * Update the list of modifications with a modification associated with a specific
      * role, if it's requested.
      */
-    private void getOperationalModForReplace( boolean hasRole, AttributeType attributeType, Entry entry, DN oldDn, DN newDn, List<Modification> modifications )
+    private void getOperationalModForReplace( boolean hasRole, AttributeType attributeType, Entry entry, Dn oldDn, Dn newDn, List<Modification> modifications )
     {
         String oldDnStr = oldDn.getNormName();
         String newDnStr = newDn.getNormName();
@@ -615,7 +615,7 @@ public class SubentryInterceptor extends
      * Get the list of modifications to be applied on an entry to inject the operational attributes
      * associated with the administrative roles.
      */
-    private List<Modification> getOperationalModsForReplace( DN oldDn, DN newDn, Subentry subentry, Entry entry )
+    private List<Modification> getOperationalModsForReplace( Dn oldDn, Dn newDn, Subentry subentry, Entry entry )
         throws Exception
     {
         List<Modification> modifications = new ArrayList<Modification>();
@@ -633,7 +633,7 @@ public class SubentryInterceptor extends
      * Gets the subschema operational attributes to be added to or removed from
      * an entry selected by a subentry's subtreeSpecification.
      */
-    private List<EntryAttribute> getSubentryOperationalAttributes( DN dn, Subentry subentry ) throws LdapException
+    private List<EntryAttribute> getSubentryOperationalAttributes( Dn dn, Subentry subentry ) throws LdapException
     {
         List<EntryAttribute> attributes = new ArrayList<EntryAttribute>();
 
@@ -678,7 +678,7 @@ public class SubentryInterceptor extends
      * @return the set of modifications required to remove an entry's reference to
      * a subentry
      */
-    private List<Modification> getOperationalModsForRemove( DN subentryDn, Entry candidate ) throws LdapException
+    private List<Modification> getOperationalModsForRemove( Dn subentryDn, Entry candidate ) throws LdapException
     {
         List<Modification> modifications = new ArrayList<Modification>();
         String dn = subentryDn.getNormName();
@@ -739,13 +739,13 @@ public class SubentryInterceptor extends
     /**
      * Get the list of modification to apply to all the entries
      */
-    private List<Modification> getModsOnEntryModification( DN name, Entry oldEntry, Entry newEntry ) throws LdapException
+    private List<Modification> getModsOnEntryModification( Dn name, Entry oldEntry, Entry newEntry ) throws LdapException
     {
         List<Modification> modList = new ArrayList<Modification>();
 
-        for ( DN subentryDn : subentryCache )
+        for ( Dn subentryDn : subentryCache )
         {
-            DN apDn = subentryDn.getParent();
+            Dn apDn = subentryDn.getParent();
             SubtreeSpecification ss = subentryCache.getSubentry( subentryDn ).getSubtreeSpecification();
             boolean isOldEntrySelected = evaluator.evaluate( ss, apDn, name, oldEntry );
             boolean isNewEntrySelected = evaluator.evaluate( ss, apDn, name, newEntry );
@@ -797,7 +797,7 @@ public class SubentryInterceptor extends
     /**
      * Update the Operational Attribute with the reference to the subentry
      */
-    private void setOperationalAttribute( Entry entry, DN subentryDn, AttributeType opAttr) throws LdapException
+    private void setOperationalAttribute( Entry entry, Dn subentryDn, AttributeType opAttr) throws LdapException
     {
         EntryAttribute operational = entry.get( opAttr );
 
@@ -819,14 +819,14 @@ public class SubentryInterceptor extends
      */
     public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        DN dn = addContext.getDn();
+        Dn dn = addContext.getDn();
         ClonedServerEntry entry = addContext.getEntry();
 
         // Check if the added entry is a subentry
         if ( entry.contains( OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC ) )
         {
             // get the name of the administrative point and its administrativeRole attributes
-            // The AP must be the parent DN, but we also have to check that the given DN
+            // The AP must be the parent Dn, but we also have to check that the given Dn
             // is not the rootDSE or a NamingContext
             if ( dn.isRootDSE() || isNamingContext( dn ) )
             {
@@ -836,7 +836,7 @@ public class SubentryInterceptor extends
 
             // Get the administrativePoint role : we must have one immediately
             // upper
-            DN apDn = dn.getParent();
+            Dn apDn = dn.getParent();
             checkAdministrativeRole( addContext, apDn );
 
             /* ----------------------------------------------------------------
@@ -872,7 +872,7 @@ public class SubentryInterceptor extends
              * operational attributes calculated above.
              * ----------------------------------------------------------------
              */
-            DN baseDn = apDn;
+            Dn baseDn = apDn;
             baseDn = baseDn.addAll( subentry.getSubtreeSpecification().getBase() );
 
             updateEntries( OperationEnum.ADD, addContext.getSession(), dn, apDn, subentry.getSubtreeSpecification(), baseDn, operationalAttributes );
@@ -889,9 +889,9 @@ public class SubentryInterceptor extends
             // We brutally check *all* the subentries, as we don't hold a hierarchy
             // of AP
             // TODO : add a hierarchy of subentries
-            for ( DN subentryDn : subentryCache )
+            for ( Dn subentryDn : subentryCache )
             {
-                DN apDn = subentryDn.getParent();
+                Dn apDn = subentryDn.getParent();
 
                 // No need to evaluate the entry if it's not below an AP.
                 if ( dn.isChildOf( apDn ) )
@@ -942,7 +942,7 @@ public class SubentryInterceptor extends
      */
     public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN dn = deleteContext.getDn();
+        Dn dn = deleteContext.getDn();
         Entry entry = deleteContext.getEntry();
 
         // If the entry has a "subentry" Objectclass, we can process the entry.
@@ -955,12 +955,12 @@ public class SubentryInterceptor extends
              * Find the baseDn for the subentry and use that to search the tree
              * for all entries included by the subtreeSpecification.  Then we
              * check the entry for subentry operational attribute that contain
-             * the DN of the subentry.  These are the subentry operational
+             * the Dn of the subentry.  These are the subentry operational
              * attributes we remove from the entry in a modify operation.
              * ----------------------------------------------------------------
              */
-            DN apDn = dn.getParent();
-            DN baseDn = apDn;
+            Dn apDn = dn.getParent();
+            Dn baseDn = apDn;
             baseDn = baseDn.addAll( removedSubentry.getSubtreeSpecification().getBase() );
 
             // Remove all the references to this removed subentry from all the selected entries
@@ -1002,7 +1002,7 @@ public class SubentryInterceptor extends
      */
     public void modify( NextInterceptor next, ModifyOperationContext modifyContext ) throws LdapException
     {
-        DN dn = modifyContext.getDn();
+        Dn dn = modifyContext.getDn();
         List<Modification> modifications = modifyContext.getModItems();
 
         Entry entry = modifyContext.getEntry();
@@ -1055,8 +1055,8 @@ public class SubentryInterceptor extends
             next.modify( modifyContext );
 
             // search for all entries selected by the old SS and remove references to subentry
-            DN apName = dn.getParent();
-            DN oldBaseDn = apName;
+            Dn apName = dn.getParent();
+            Dn oldBaseDn = apName;
             oldBaseDn = oldBaseDn.addAll( ssOld.getBase() );
 
             ExprNode filter = new PresenceNode( OBJECT_CLASS_AT );
@@ -1076,7 +1076,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry candidate = subentries.get();
-                    DN candidateDn = candidate.getDn();
+                    Dn candidateDn = candidate.getDn();
 
                     if ( evaluator.evaluate( ssOld, apName, candidateDn, candidate ) )
                     {
@@ -1093,7 +1093,7 @@ public class SubentryInterceptor extends
             // search for all selected entries by the new SS and add references to subentry
             subentry = subentryCache.getSubentry( dn );
             List<EntryAttribute> operationalAttributes = getSubentryOperationalAttributes( dn, subentry );
-            DN newBaseDn = apName;
+            Dn newBaseDn = apName;
             newBaseDn = newBaseDn.addAll( ssNew.getBase() );
 
             searchOperationContext = new SearchOperationContext( modifyContext.getSession(), newBaseDn, filter, controls );
@@ -1106,7 +1106,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry candidate = subentries.get();
-                    DN candidateDn = candidate.getDn();
+                    Dn candidateDn = candidate.getDn();
 
                     if ( evaluator.evaluate( ssNew, apName, candidateDn, candidate ) )
                     {
@@ -1169,8 +1169,8 @@ public class SubentryInterceptor extends
      */
     public void move( NextInterceptor next, MoveOperationContext moveContext ) throws LdapException
     {
-        DN oldDn = moveContext.getDn();
-        DN newSuperiorDn = moveContext.getNewSuperior();
+        Dn oldDn = moveContext.getDn();
+        Dn newSuperiorDn = moveContext.getNewSuperior();
 
         Entry entry = moveContext.getOriginalEntry();
 
@@ -1187,10 +1187,10 @@ public class SubentryInterceptor extends
 
             Subentry subentry = subentryCache.removeSubentry( oldDn );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            DN apName = oldDn.getParent();
-            DN baseDn = apName;
+            Dn apName = oldDn.getParent();
+            Dn baseDn = apName;
             baseDn = baseDn.addAll( ss.getBase() );
-            DN newName = newSuperiorDn;
+            Dn newName = newSuperiorDn;
             newName = newName.add( oldDn.getRdn() );
             newName.normalize( schemaManager );
 
@@ -1218,7 +1218,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry candidate = subentries.get();
-                    DN dn = candidate.getDn();
+                    Dn dn = candidate.getDn();
                     dn.normalize( schemaManager );
 
                     if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -1253,9 +1253,9 @@ public class SubentryInterceptor extends
             // Move the entry
             next.move( moveContext );
 
-            // calculate the new DN now for use below to modify subentry operational
+            // calculate the new Dn now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            DN newDn = moveContext.getNewDn();
+            Dn newDn = moveContext.getNewDn();
             List<Modification> mods = getModsOnEntryRdnChange( oldDn, newDn, entry );
 
             // Update the entry operational attributes
@@ -1269,8 +1269,8 @@ public class SubentryInterceptor extends
 
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
     {
-        DN oldDn = moveAndRenameContext.getDn();
-        DN newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
+        Dn oldDn = moveAndRenameContext.getDn();
+        Dn newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
 
         Entry entry = moveAndRenameContext.getOriginalEntry();
 
@@ -1278,10 +1278,10 @@ public class SubentryInterceptor extends
         {
             Subentry subentry = subentryCache.removeSubentry( oldDn );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            DN apName = oldDn.getParent();
-            DN baseDn = apName;
+            Dn apName = oldDn.getParent();
+            Dn baseDn = apName;
             baseDn = baseDn.addAll( ss.getBase() );
-            DN newName = newSuperiorDn.getParent();
+            Dn newName = newSuperiorDn.getParent();
 
             newName = newName.add( moveAndRenameContext.getNewRdn() );
             newName.normalize( schemaManager );
@@ -1309,7 +1309,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry candidate = subentries.get();
-                    DN dn = candidate.getDn();
+                    Dn dn = candidate.getDn();
                     dn.normalize( schemaManager );
 
                     if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -1337,9 +1337,9 @@ public class SubentryInterceptor extends
 
             next.moveAndRename( moveAndRenameContext );
 
-            // calculate the new DN now for use below to modify subentry operational
+            // calculate the new Dn now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            DN newDn = moveAndRenameContext.getNewDn();
+            Dn newDn = moveAndRenameContext.getNewDn();
             List<Modification> mods = getModsOnEntryRdnChange( oldDn, newDn, entry );
 
             if ( mods.size() > 0 )
@@ -1352,7 +1352,7 @@ public class SubentryInterceptor extends
 
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
     {
-        DN oldDn = renameContext.getDn();
+        Dn oldDn = renameContext.getDn();
 
         Entry entry = renameContext.getEntry().getClonedEntry();
 
@@ -1361,10 +1361,10 @@ public class SubentryInterceptor extends
             // @Todo To be reviewed !!!
             Subentry subentry = subentryCache.removeSubentry( oldDn );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            DN apName = oldDn.getParent();
-            DN baseDn = apName;
+            Dn apName = oldDn.getParent();
+            Dn baseDn = apName;
             baseDn = baseDn.addAll( ss.getBase() );
-            DN newName = oldDn.getParent();
+            Dn newName = oldDn.getParent();
 
             newName = newName.add( renameContext.getNewRdn() );
             newName.normalize( schemaManager );
@@ -1390,7 +1390,7 @@ public class SubentryInterceptor extends
                 while ( subentries.next() )
                 {
                     Entry candidate = subentries.get();
-                    DN dn = candidate.getDn();
+                    Dn dn = candidate.getDn();
                     dn.normalize( schemaManager );
 
                     if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -1418,9 +1418,9 @@ public class SubentryInterceptor extends
 
             next.rename( renameContext );
 
-            // calculate the new DN now for use below to modify subentry operational
+            // calculate the new Dn now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            DN newName = renameContext.getNewDn();
+            Dn newName = renameContext.getNewDn();
 
             List<Modification> mods = getModsOnEntryRdnChange( oldDn, newName, entry );
 
@@ -1473,13 +1473,13 @@ public class SubentryInterceptor extends
      * @return the set of subentry op attrs for an entry
      * @throws Exception if there are problems accessing entry information
      */
-    public Entry getSubentryAttributes( DN dn, Entry entryAttrs ) throws LdapException
+    public Entry getSubentryAttributes( Dn dn, Entry entryAttrs ) throws LdapException
     {
         Entry subentryAttrs = new DefaultEntry( schemaManager, dn );
 
-        for ( DN subentryDn : subentryCache )
+        for ( Dn subentryDn : subentryCache )
         {
-            DN apDn = subentryDn.getParent();
+            Dn apDn = subentryDn.getParent();
             Subentry subentry = subentryCache.getSubentry( subentryDn );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.event.ExpressionEvaluator;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 
@@ -62,7 +62,7 @@ public class SubtreeEvaluator
      * @return true if the entry is selected by the specification, false if it is not
      * @throws LdapException if errors are encountered while evaluating selection
      */
-    public boolean evaluate( SubtreeSpecification subtree, DN apDn, DN entryDn, Entry entry )
+    public boolean evaluate( SubtreeSpecification subtree, Dn apDn, Dn entryDn, Entry entry )
         throws LdapException
     {
         /* =====================================================================
@@ -76,13 +76,13 @@ public class SubtreeEvaluator
          * =====================================================================
          */
         // First construct the subtree base, which is the concatenation of the
-        // AP DN and the subentry base
-        DN subentryBaseDn = apDn;
+        // AP Dn and the subentry base
+        Dn subentryBaseDn = apDn;
         subentryBaseDn = subentryBaseDn.addAll( subtree.getBase() );
         
         if ( !entryDn.isChildOf( subentryBaseDn ) )
         {
-            // The entry DN is not part of the subtree specification, get out
+            // The entry Dn is not part of the subtree specification, get out
             return false;
         }
 
@@ -119,9 +119,9 @@ public class SubtreeEvaluator
         if ( ( subtree.getChopBeforeExclusions().size() != 0 ) || 
              ( subtree.getChopAfterExclusions().size() != 0 ) )
         {
-            DN entryRelativeDn = entryDn.getSuffix( apDn.size() + subtree.getBase().size() );
+            Dn entryRelativeDn = entryDn.getSuffix( apDn.size() + subtree.getBase().size() );
             
-            for ( DN chopBeforeDn : subtree.getChopBeforeExclusions() )
+            for ( Dn chopBeforeDn : subtree.getChopBeforeExclusions() )
             {
                 if ( entryRelativeDn.isChildOf( chopBeforeDn ) )
                 {
@@ -129,7 +129,7 @@ public class SubtreeEvaluator
                 }
             }
     
-            for ( DN chopAfterDn : subtree.getChopAfterExclusions() )
+            for ( Dn chopAfterDn : subtree.getChopAfterExclusions() )
             {
                 if ( entryRelativeDn.isChildOf( chopAfterDn ) && !chopAfterDn.equals( entryRelativeDn ) )
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter.Generic_LDAP_CONTEXT;
 
@@ -51,10 +51,10 @@ public abstract class AbstractStoredProc
     }
     
     
-    protected DN getOperationPrincipal() throws LdapInvalidDnException
+    protected Dn getOperationPrincipal() throws LdapInvalidDnException
     {
         Principal principal = opContext.getSession().getEffectivePrincipal();
-        DN userName = opContext.getSession().getDirectoryService().getDNFactory().create( principal.getName() );
+        Dn userName = opContext.getSession().getDirectoryService().getDNFactory().create( principal.getName() );
         return userName;
     }
     
@@ -109,7 +109,7 @@ public abstract class AbstractStoredProc
         public Object inject(  OperationContext opContext, StoredProcedureParameter param ) throws LdapException
         {
             Generic_LDAP_CONTEXT ldapCtxParam = ( Generic_LDAP_CONTEXT ) param;
-            DN ldapCtxName = ldapCtxParam.getCtxName();
+            Dn ldapCtxName = ldapCtxParam.getCtxName();
             return opContext.lookup( ldapCtxName, ByPassConstants.LOOKUP_BYPASS );
         }
     };

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java Sun Jan 23 01:17:06 2011
@@ -26,17 +26,17 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class AddStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private DN addedEntryName;
+    private Dn addedEntryName;
     private Entry addedEntry;
     
     
-    public AddStoredProcedureParameterInjector( OperationContext opContext, DN addedEntryName, 
+    public AddStoredProcedureParameterInjector( OperationContext opContext, Dn addedEntryName,
         Entry addedEntry )
     {
         super( opContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java Sun Jan 23 01:17:06 2011
@@ -26,17 +26,17 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class DeleteStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private DN deletedEntryName;
+    private Dn deletedEntryName;
     private Entry deletedEntry;
 
     
-    public DeleteStoredProcedureParameterInjector( OperationContext opContext, DN deletedEntryName ) 
+    public DeleteStoredProcedureParameterInjector( OperationContext opContext, Dn deletedEntryName )
         throws LdapException
     {
         super( opContext );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Sun Jan 23 01:17:06 2011
@@ -24,33 +24,33 @@ import java.util.Map;
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-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.trigger.StoredProcedureParameter;
 
 
 public class ModifyDNStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
     private boolean deleteOldRn;
-    private RDN oldRDN;
-    private RDN newRDN;
-    private DN oldSuperiorDN;
-    private DN newSuperiorDN;
-    private DN oldDN;
-    private DN newDN;
+    private Rdn oldRdn;
+    private Rdn newRdn;
+    private Dn oldSuperiorDn;
+    private Dn newSuperiorDn;
+    private Dn oldDn;
+    private Dn newDn;
 
 
     public ModifyDNStoredProcedureParameterInjector( OperationContext opContext, boolean deleteOldRn,
-        RDN oldRDN, RDN newRDN, DN oldSuperiorDN, DN newSuperiorDN, DN oldDN, DN newDN)
+        Rdn oldRDN, Rdn newRdn, Dn oldSuperiorDn, Dn newSuperiorDn, Dn oldDn, Dn newDn)
     {
         super( opContext );
         this.deleteOldRn = deleteOldRn;
-        this.oldRDN = (RDN)oldRDN.clone();
-        this.newRDN = (RDN)newRDN.clone();
-        this.oldSuperiorDN = oldSuperiorDN;
-        this.newSuperiorDN = newSuperiorDN;
-        this.oldDN = oldDN;
-        this.newDN = newDN;
+        this.oldRdn = (Rdn)oldRDN.clone();
+        this.newRdn = (Rdn) newRdn.clone();
+        this.oldSuperiorDn = oldSuperiorDn;
+        this.newSuperiorDn = newSuperiorDn;
+        this.oldDn = oldDn;
+        this.newDn = newDn;
         
         Map<Class<?>, MicroInjector> injectors = super.getInjectors();
         injectors.put( StoredProcedureParameter.ModifyDN_ENTRY.class, $entryInjector );
@@ -70,7 +70,7 @@ public class ModifyDNStoredProcedurePara
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( oldDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( oldDn.getName() );
         }
     };
 
@@ -82,7 +82,7 @@ public class ModifyDNStoredProcedurePara
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( newRDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( newRdn.getName() );
         }
     };
 
@@ -106,43 +106,43 @@ public class ModifyDNStoredProcedurePara
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( newSuperiorDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( newSuperiorDn.getName() );
         }
     };
     
     /**
-     * Extra injector for 'oldRDN' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
+     * Extra injector for 'oldRdn' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
      */
     MicroInjector $oldRDNInjector = new MicroInjector()
     {
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( oldRDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( oldRdn.getName() );
         }
     };
     
     /**
-     * Extra injector for 'oldRDN' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
+     * Extra injector for 'oldRdn' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
      */
     MicroInjector $oldSuperiorDNInjector = new MicroInjector()
     {
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( oldSuperiorDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( oldSuperiorDn.getName() );
         }
     };
     
     /**
-     * Extra injector for 'newDN' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
+     * Extra injector for 'newDn' which can be derived from parameters specified for ModifyDNRequest as in RFC4511.
      */
     MicroInjector $newDNInjector = new MicroInjector()
     {
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws LdapInvalidDnException
         {
             // Return a safe copy constructed with user provided name.
-            return opContext.getSession().getDirectoryService().getDNFactory().create( newDN.getName() );
+            return opContext.getSession().getDirectoryService().getDNFactory().create( newDn.getName() );
         }
     };
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java Sun Jan 23 01:17:06 2011
@@ -31,13 +31,13 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class ModifyStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private DN modifiedEntryName;
+    private Dn modifiedEntryName;
     private List<Modification> modifications;
     private Entry oldEntry;
     

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java Sun Jan 23 01:17:06 2011
@@ -24,18 +24,18 @@ import org.apache.directory.server.const
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 public class SimpleTriggerExecutionAuthorizer implements TriggerExecutionAuthorizer
 {
-    private static DN adminName;
+    private static Dn adminName;
     
     static
     {
         try
         {
-            adminName = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+            adminName = new Dn( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
         }
         catch ( LdapInvalidDnException e )
         {
@@ -46,7 +46,7 @@ public class SimpleTriggerExecutionAutho
     
     public boolean hasPermission( OperationContext opContext ) throws LdapException
     {
-        DN principalName = opContext.getSession().getEffectivePrincipal().getDN();
+        Dn principalName = opContext.getSession().getEffectivePrincipal().getDN();
         return principalName.equals( adminName );
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Sun Jan 23 01:17:06 2011
@@ -53,8 +53,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.exception.LdapOtherException;
-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.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.ldap.trigger.ActionTime;
@@ -112,7 +112,7 @@ public class TriggerInterceptor extends 
      * @param proxy the partition nexus proxy 
      */
     private void addPrescriptiveTriggerSpecs( OperationContext opContext, List<TriggerSpecification> triggerSpecs,
-        DN dn, Entry entry ) throws LdapException
+        Dn dn, Entry entry ) throws LdapException
     {
 
         /*
@@ -126,7 +126,7 @@ public class TriggerInterceptor extends 
          */
         if ( entry.contains( OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC ) )
         {
-            DN parentDn = dn;
+            Dn parentDn = dn;
             parentDn = parentDn.remove( dn.size() - 1 );
 
             entry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
@@ -256,7 +256,7 @@ public class TriggerInterceptor extends 
 
     public void add( NextInterceptor next, AddOperationContext addContext ) throws LdapException
     {
-        DN name = addContext.getDn();
+        Dn name = addContext.getDn();
         Entry entry = addContext.getEntry();
 
         // Bypass trigger handling if the service is disabled.
@@ -291,7 +291,7 @@ public class TriggerInterceptor extends 
 
     public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN name = deleteContext.getDn();
+        Dn name = deleteContext.getDn();
 
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -332,7 +332,7 @@ public class TriggerInterceptor extends 
             return;
         }
 
-        DN normName = modifyContext.getDn();
+        Dn normName = modifyContext.getDn();
 
         // Gather supplementary data.
         Entry originalEntry = modifyContext.getEntry();
@@ -359,8 +359,8 @@ public class TriggerInterceptor extends 
 
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws LdapException
     {
-        DN name = renameContext.getDn();
-        RDN newRdn = renameContext.getNewRdn();
+        Dn name = renameContext.getDn();
+        Rdn newRdn = renameContext.getNewRdn();
         boolean deleteOldRn = renameContext.getDeleteOldRdn();
 
         // Bypass trigger handling if the service is disabled.
@@ -374,16 +374,16 @@ public class TriggerInterceptor extends 
         Entry renamedEntry = renameContext.getEntry().getClonedEntry();
 
         // @TODO : To be completely reviewed !!!
-        RDN oldRDN = name.getRdn();
-        DN oldSuperiorDN = ( DN ) name;
-        oldSuperiorDN = oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
-        DN newSuperiorDN = oldSuperiorDN;
-        DN oldDN = name;
-        DN newDN = name;
-        newDN = newDN.add( newRdn );
+        Rdn oldRdn = name.getRdn();
+        Dn oldSuperiorDn = (Dn) name;
+        oldSuperiorDn = oldSuperiorDn.remove( oldSuperiorDn.size() - 1 );
+        Dn newSuperiorDn = oldSuperiorDn;
+        Dn oldDn = name;
+        Dn newDn = name;
+        newDn = newDn.add( newRdn );
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector( renameContext,
-            deleteOldRn, oldRDN, newRdn, oldSuperiorDN, newSuperiorDN, oldDN, newDN );
+            deleteOldRn, oldRdn, newRdn, oldSuperiorDn, newSuperiorDn, oldDn, newDn);
 
         // Gather Trigger Specifications which apply to the entry being renamed.
         List<TriggerSpecification> triggerSpecs = new ArrayList<TriggerSpecification>();
@@ -394,7 +394,7 @@ public class TriggerInterceptor extends 
             triggerSpecs, LdapOperation.MODIFYDN_RENAME );
 
         next.rename( renameContext );
-        triggerSpecCache.subentryRenamed( name, newDN );
+        triggerSpecCache.subentryRenamed( name, newDn);
 
         // Fire AFTER Triggers.
         List<TriggerSpecification> afterTriggerSpecs = triggerMap.get( ActionTime.AFTER );
@@ -404,9 +404,9 @@ public class TriggerInterceptor extends 
 
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
     {
-        DN oldDn = moveAndRenameContext.getDn();
-        DN newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
-        RDN newRdn = moveAndRenameContext.getNewRdn();
+        Dn oldDn = moveAndRenameContext.getDn();
+        Dn newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
+        Rdn newRdn = moveAndRenameContext.getNewRdn();
         boolean deleteOldRn = moveAndRenameContext.getDeleteOldRdn();
 
         // Bypass trigger handling if the service is disabled.
@@ -419,14 +419,14 @@ public class TriggerInterceptor extends 
         // Gather supplementary data.        
         Entry movedEntry = moveAndRenameContext.getOriginalEntry();
 
-        RDN oldRDN = oldDn.getRdn();
-        DN oldSuperiorDN = oldDn;
-        oldSuperiorDN = oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
-        DN oldDN = oldDn;
-        DN newDN = moveAndRenameContext.getNewDn();
+        Rdn oldRdn = oldDn.getRdn();
+        Dn oldSuperiorDn = oldDn;
+        oldSuperiorDn = oldSuperiorDn.remove( oldSuperiorDn.size() - 1 );
+        Dn oldDN = oldDn;
+        Dn newDn = moveAndRenameContext.getNewDn();
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector( moveAndRenameContext,
-            deleteOldRn, oldRDN, newRdn, oldSuperiorDN, newSuperiorDn, oldDN, newDN );
+            deleteOldRn, oldRdn, newRdn, oldSuperiorDn, newSuperiorDn, oldDN, newDn);
 
         // Gather Trigger Specifications which apply to the entry being exported.
         List<TriggerSpecification> exportTriggerSpecs = new ArrayList<TriggerSpecification>();
@@ -447,7 +447,7 @@ public class TriggerInterceptor extends 
         // and access control subentry operational attributes.
         SubentryInterceptor subentryInterceptor = ( SubentryInterceptor ) chain.get( SubentryInterceptor.class
             .getName() );
-        Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes( newDN, importedEntry );
+        Entry fakeImportedEntry = subentryInterceptor.getSubentryAttributes(newDn, importedEntry );
 
         for ( EntryAttribute attribute : importedEntry )
         {
@@ -457,7 +457,7 @@ public class TriggerInterceptor extends 
         // Gather Trigger Specifications which apply to the entry being imported.
         // Note: Entry Trigger Specifications are not valid for Import.
         List<TriggerSpecification> importTriggerSpecs = new ArrayList<TriggerSpecification>();
-        addPrescriptiveTriggerSpecs( moveAndRenameContext, importTriggerSpecs, newDN, fakeImportedEntry );
+        addPrescriptiveTriggerSpecs( moveAndRenameContext, importTriggerSpecs, newDn, fakeImportedEntry );
 
         Map<ActionTime, List<TriggerSpecification>> exportTriggerMap = getActionTimeMappedTriggerSpecsForOperation(
             exportTriggerSpecs, LdapOperation.MODIFYDN_EXPORT );
@@ -466,7 +466,7 @@ public class TriggerInterceptor extends 
             importTriggerSpecs, LdapOperation.MODIFYDN_IMPORT );
 
         next.moveAndRename( moveAndRenameContext );
-        triggerSpecCache.subentryRenamed( oldDN, newDN );
+        triggerSpecCache.subentryRenamed( oldDN, newDn);
 
         // Fire AFTER Triggers.
         List<TriggerSpecification> afterExportTriggerSpecs = exportTriggerMap.get( ActionTime.AFTER );
@@ -488,16 +488,16 @@ public class TriggerInterceptor extends 
             return;
         }
 
-        RDN rdn = moveContext.getRdn();
-        DN dn = moveContext.getDn();
-        DN newDn = moveContext.getNewDn();
-        DN oldSuperior = moveContext.getOldSuperior();
-        DN newSuperior = moveContext.getNewSuperior();
+        Rdn rdn = moveContext.getRdn();
+        Dn dn = moveContext.getDn();
+        Dn newDn = moveContext.getNewDn();
+        Dn oldSuperior = moveContext.getOldSuperior();
+        Dn newSuperior = moveContext.getNewSuperior();
 
         // Gather supplementary data.        
         Entry movedEntry = moveContext.getOriginalEntry();
 
-        //RDN newRDN = dn.getRdn();
+        //Rdn newRDN = dn.getRdn();
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector( moveContext, false,
             rdn, rdn, oldSuperior, newSuperior, dn, newDn );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Sun Jan 23 01:17:06 2011
@@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 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.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -123,13 +123,13 @@ public class TriggerSpecCache
 
         for ( String suffix:suffixes )
         {
-            DN baseDn = directoryService.getDNFactory().create( suffix );
+            Dn baseDn = directoryService.getDNFactory().create( suffix );
             ExprNode filter = new EqualityNode<String>( objectClassAt,
                     new StringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) );
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
-            DN adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+            Dn adminDn = directoryService.getDNFactory().create( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
             CoreSession adminSession = new DefaultCoreSession(
                 new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
 
@@ -144,7 +144,7 @@ public class TriggerSpecCache
                 while ( results.next() )
                 {
                     ClonedServerEntry resultEntry = results.get();
-                    DN subentryDn = resultEntry.getDn();
+                    Dn subentryDn = resultEntry.getDn();
                     EntryAttribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR );
 
                     if ( triggerSpec == null )
@@ -153,7 +153,7 @@ public class TriggerSpecCache
                         continue;
                     }
 
-                    DN normSubentryName = subentryDn.normalize( directoryService.getSchemaManager() );
+                    Dn normSubentryName = subentryDn.normalize( directoryService.getSchemaManager() );
                     subentryAdded( normSubentryName, resultEntry );
                 }
 
@@ -176,7 +176,7 @@ public class TriggerSpecCache
     }
 
 
-    public void subentryAdded( DN normName, Entry entry ) throws LdapException
+    public void subentryAdded( Dn normName, Entry entry ) throws LdapException
     {
         // only do something if the entry contains prescriptiveTrigger
         EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
@@ -209,7 +209,7 @@ public class TriggerSpecCache
     }
 
 
-    public void subentryDeleted( DN normName, Entry entry ) throws LdapException
+    public void subentryDeleted( Dn normName, Entry entry ) throws LdapException
     {
         if ( !hasPrescriptiveTrigger( entry ) )
         {
@@ -227,7 +227,7 @@ public class TriggerSpecCache
             return;
         }
 
-        DN normName = opContext.getDn();
+        Dn normName = opContext.getDn();
         List<Modification> mods = opContext.getModItems();
 
         boolean isTriggerSpecModified = false;
@@ -256,7 +256,7 @@ public class TriggerSpecCache
     }
 
 
-    public void subentryRenamed( DN oldName, DN newName )
+    public void subentryRenamed( Dn oldName, Dn newName )
     {
         triggerSpecs.put( newName.getNormName(), triggerSpecs.remove( oldName.getNormName() ) );
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
@@ -69,8 +69,8 @@ public class MaxImmSubFilterTest
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections
         .unmodifiableSet( new HashSet<MicroOperation>() );
 
-    private static final DN ROOTDSE_NAME = new DN();
-    private static DN ENTRY_NAME;
+    private static final Dn ROOTDSE_NAME = new Dn();
+    private static Dn ENTRY_NAME;
     private static Collection<ProtectedItem> PROTECTED_ITEMS = new ArrayList<ProtectedItem>();
     private static Entry ENTRY;
 
@@ -92,7 +92,7 @@ public class MaxImmSubFilterTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        ENTRY_NAME = new DN( "ou=test, ou=system" );
+        ENTRY_NAME = new Dn( "ou=test, ou=system" );
         PROTECTED_ITEMS.add( new MaxImmSubItem( 2 ) );
         ENTRY = new DefaultEntry( schemaManager, ENTRY_NAME );
     }

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
@@ -90,7 +90,7 @@ public class MaxValueCountFilterTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        DN entryName = new DN( "ou=test, ou=system" );
+        Dn entryName = new Dn( "ou=test, ou=system" );
         ENTRY = new DefaultEntry( schemaManager, entryName );
         FULL_ENTRY = new DefaultEntry( schemaManager, entryName );
         

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,7 +52,7 @@ import org.junit.runner.RunWith;
 @Concurrent()
 public class MostSpecificUserClassFilterTest
 {
-    private static final Set<DN> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<DN>() );
+    private static final Set<Dn> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<Dn>() );
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
     private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );
     private static final Set<SubtreeSpecification> EMPTY_SUBTREE_SPECIFICATION_COLLECTION = Collections.unmodifiableSet( new HashSet<SubtreeSpecification>() );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Sun Jan 23 01:17:06 2011
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.StringValue;
-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.schemaloader.JarLdifSchemaLoader;
@@ -77,10 +77,10 @@ public class RelatedProtectedItemFilterT
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
 
-    private static DN GROUP_NAME;
-    private static DN USER_NAME;
-    private static Set<DN> USER_NAMES = new HashSet<DN>();
-    private static Set<DN> GROUP_NAMES = new HashSet<DN>();
+    private static Dn GROUP_NAME;
+    private static Dn USER_NAME;
+    private static Set<Dn> USER_NAMES = new HashSet<Dn>();
+    private static Set<Dn> GROUP_NAMES = new HashSet<Dn>();
 
     private static SchemaManager schemaManager;
 
@@ -111,8 +111,8 @@ public class RelatedProtectedItemFilterT
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        GROUP_NAME = new DN( "ou=test,ou=groups,ou=system" );
-        USER_NAME = new DN( "ou=test, ou=users, ou=system" );
+        GROUP_NAME = new Dn( "ou=test,ou=groups,ou=system" );
+        USER_NAME = new Dn( "ou=test, ou=users, ou=system" );
         
         filterA = new RelatedProtectedItemFilter( new RefinementEvaluator( new RefinementLeafEvaluator(
             schemaManager ) ), new ExpressionEvaluator( schemaManager ), schemaManager );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -58,10 +58,10 @@ public class RelatedUserClassFilterTest
 
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
 
-    private static DN GROUP_NAME;
-    private static DN USER_NAME;
-    private static final Set<DN> USER_NAMES = new HashSet<DN>();
-    private static final Set<DN> GROUP_NAMES = new HashSet<DN>();
+    private static Dn GROUP_NAME;
+    private static Dn USER_NAME;
+    private static final Set<Dn> USER_NAMES = new HashSet<Dn>();
+    private static final Set<Dn> GROUP_NAMES = new HashSet<Dn>();
 
     private static SubtreeEvaluator SUBTREE_EVALUATOR;
 
@@ -75,8 +75,8 @@ public class RelatedUserClassFilterTest
         
         try
         {
-            GROUP_NAME = new DN( "ou=test,ou=groups,ou=system" );
-            USER_NAME = new DN( "ou=test, ou=users, ou=system" );
+            GROUP_NAME = new Dn( "ou=test,ou=groups,ou=system" );
+            USER_NAME = new Dn( "ou=test, ou=users, ou=system" );
         }
         catch ( LdapInvalidDnException e )
         {
@@ -127,7 +127,7 @@ public class RelatedUserClassFilterTest
         aciContext.setAciTuples( tuples );
         aciContext.setUserDn( USER_NAME );
         aciContext.setAuthenticationLevel( AuthenticationLevel.NONE );
-        aciContext.setEntryDn( new DN( "ou=unrelated" ) );
+        aciContext.setEntryDn( new Dn( "ou=unrelated" ) );
 
         assertEquals( 0, filter.filter( aciContext, OperationScope.ENTRY, null ).size() );
     }
@@ -142,7 +142,7 @@ public class RelatedUserClassFilterTest
         aciContext.setAciTuples( tuples );
         aciContext.setUserDn( USER_NAME );
         aciContext.setAuthenticationLevel( AuthenticationLevel.NONE );
-        aciContext.setEntryDn( new DN( "ou=phoneBook, ou=test, ou=users, ou=system" ) );
+        aciContext.setEntryDn( new Dn( "ou=phoneBook, ou=test, ou=users, ou=system" ) );
 
         assertEquals( 1, filter.filter( aciContext, OperationScope.ENTRY, null ).size() );
 
@@ -150,7 +150,7 @@ public class RelatedUserClassFilterTest
         aciContext.setAciTuples( tuples );
         aciContext.setUserDn( USER_NAME );
         aciContext.setAuthenticationLevel( AuthenticationLevel.NONE );
-        aciContext.setEntryDn( new DN( "ou=unrelated" ) );
+        aciContext.setEntryDn( new Dn( "ou=unrelated" ) );
 
         assertEquals( 0, filter.filter( aciContext, OperationScope.ENTRY, null ).size() );
     }
@@ -170,7 +170,7 @@ public class RelatedUserClassFilterTest
 
         aciContext = new AciContext( null, null );
         aciContext.setAciTuples( tuples );
-        aciContext.setUserDn( new DN( "ou=unrelateduser, ou=users" ) );
+        aciContext.setUserDn( new Dn( "ou=unrelateduser, ou=users" ) );
         aciContext.setAuthenticationLevel( AuthenticationLevel.NONE );
         aciContext.setEntryDn( USER_NAME );
 
@@ -191,8 +191,8 @@ public class RelatedUserClassFilterTest
 
         assertEquals( 1, filter.filter( aciContext, OperationScope.ENTRY, null ).size() );
 
-        Set<DN> wrongGroupNames = new HashSet<DN>();
-        wrongGroupNames.add( new DN( "ou=unrelatedgroup" ) );
+        Set<Dn> wrongGroupNames = new HashSet<Dn>();
+        wrongGroupNames.add( new Dn( "ou=unrelatedgroup" ) );
 
         aciContext = new AciContext( null, null );
         aciContext.setAciTuples( tuples );
@@ -282,11 +282,11 @@ public class RelatedUserClassFilterTest
         }
         else
         {
-            Set<DN> names = new HashSet<DN>();
+            Set<Dn> names = new HashSet<Dn>();
             
             try
             {
-                names.add( new DN( "dummy=dummy" ) );
+                names.add( new Dn( "dummy=dummy" ) );
             }
             catch ( LdapInvalidDnException e )
             {

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Sun Jan 23 01:17:06 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.StringValue;
-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.schemaloader.JarLdifSchemaLoader;
@@ -94,7 +94,7 @@ public class RestrictedByFilterTest
             fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
         }
 
-        DN entryName = new DN( "ou=test, ou=system" );
+        Dn entryName = new Dn( "ou=test, ou=system" );
         PROTECTED_ITEMS.add( new MaxImmSubItem( 2 ) );
         ENTRY = new DefaultEntry( schemaManager, entryName );
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifRevertor;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
 import org.apache.directory.shared.util.DateUtils;
@@ -107,7 +107,7 @@ public class MemoryChangeLogStoreTest
         forward.putAttribute( "objectClass", "organizationalUnit" );
         forward.putAttribute( "ou", "system" );
 
-        LdifEntry reverse = LdifRevertor.reverseAdd( new DN( forward.getDn() ) );
+        LdifEntry reverse = LdifRevertor.reverseAdd( new Dn( forward.getDn() ) );
         assertEquals( 1, store.log( new LdapPrincipal(), forward, reverse ).getRevision() );
         assertEquals( 1, store.getCurrentRevision() );
     }
@@ -116,10 +116,10 @@ public class MemoryChangeLogStoreTest
     @Test
     public void testChangeLogSerialization() throws LdapException, IOException, ClassNotFoundException
     {
-        DN systemDn = new DN( "ou=system" );
+        Dn systemDn = new Dn( "ou=system" );
         systemDn.normalize( oidsMap );
         
-        DN adminDn = new DN( "uid=admin, ou=system" );
+        Dn adminDn = new Dn( "uid=admin, ou=system" );
         adminDn.normalize( oidsMap );
 
         LdifEntry forward = new LdifEntry();
@@ -128,7 +128,7 @@ public class MemoryChangeLogStoreTest
         forward.putAttribute( "objectClass", "organizationalUnit" );
         forward.putAttribute( "ou", "system" );
         
-        DN reverseDn = new DN( forward.getDn() );
+        Dn reverseDn = new Dn( forward.getDn() );
         reverseDn.normalize( oidsMap );
 
         LdifEntry reverse = LdifRevertor.reverseAdd( reverseDn );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.invocation.InvocationStack;
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -86,9 +86,9 @@ public class InterceptorChainTest
     @Test
     public void testNoBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         InvocationStack.getInstance().push( lookupContext );
@@ -112,9 +112,9 @@ public class InterceptorChainTest
     @Test
     public void testSingleBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         lookupContext.setByPassed( Collections.singleton( "0" ) );
@@ -139,9 +139,9 @@ public class InterceptorChainTest
     @Test
     public void testAdjacentDoubleBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
@@ -169,9 +169,9 @@ public class InterceptorChainTest
     @Test
     public void testFrontAndBackDoubleBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
@@ -198,9 +198,9 @@ public class InterceptorChainTest
     @Test
     public void testDoubleBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
@@ -227,9 +227,9 @@ public class InterceptorChainTest
     @Test
     public void testCompleteBypass() throws Exception
     {
-        DN dn = new DN( "ou=system" );
+        Dn dn = new Dn( "ou=system" );
         DirectoryService ds = new MockDirectoryService( 0 );
-        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ),
+        DefaultCoreSession session = new DefaultCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             ds );
         LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
         lookupContext.setByPassed( ByPassConstants.BYPASS_ALL_COLLECTION );

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Sun Jan 23 01:17:06 2011
@@ -26,7 +26,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -55,7 +55,7 @@ public class PreferencesUtilsTest
         
         String test = "/org/apache/kerberos/";
 
-        DN dn = ( DN ) PreferencesUtils.toSysDn( test );
+        Dn dn = (Dn) PreferencesUtils.toSysDn( test );
 
         assertEquals( expectedDN, dn.getName() );
 
@@ -63,7 +63,7 @@ public class PreferencesUtilsTest
 
         test = "/org/apache/kerberos";
 
-        dn = ( DN ) PreferencesUtils.toSysDn( test );
+        dn = (Dn) PreferencesUtils.toSysDn( test );
 
         assertEquals( expectedDN, dn.getName() );
 
@@ -71,7 +71,7 @@ public class PreferencesUtilsTest
 
         test = "/";
 
-        dn = ( DN ) PreferencesUtils.toSysDn( test );
+        dn = (Dn) PreferencesUtils.toSysDn( test );
 
         assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getName() );
 
@@ -79,7 +79,7 @@ public class PreferencesUtilsTest
 
         test = "//////";
 
-        dn = ( DN ) PreferencesUtils.toSysDn( test );
+        dn = (Dn) PreferencesUtils.toSysDn( test );
 
         assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getName() );
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
@@ -97,7 +97,7 @@ public class TlsKeyGeneratorTest
     @Test
     public void testAll() throws Exception
     {
-        Entry entry = new DefaultEntry( schemaManager, new DN() );
+        Entry entry = new DefaultEntry( schemaManager, new Dn() );
         TlsKeyGenerator.addKeyPair( entry );
         LOG.debug( "Entry: {}", entry );
         assertTrue( entry.contains( SchemaConstants.OBJECT_CLASS_AT, TlsKeyGenerator.TLS_KEY_INFO_OC ) );