directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918766 [5/6] - in /directory/apacheds/trunk: avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/ avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ core-api/src/main/java/org/apache/director...
Date Wed, 03 Mar 2010 23:25:15 GMT
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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -75,7 +75,7 @@
 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.LdapDN;
+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;
@@ -165,10 +165,10 @@
         // search each namingContext for subentries
         for ( String suffix:suffixes )
         {
-            LdapDN suffixDn = new LdapDN( suffix );
+            DN suffixDn = new DN( suffix );
             suffixDn.normalize( schemaManager.getNormalizerMapping() );
 
-            LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+            DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
             adminDn.normalize( schemaManager.getNormalizerMapping() );
             CoreSession adminSession = new DefaultCoreSession( 
                 new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
@@ -179,7 +179,7 @@
             while ( subentries.next() )
             {
                 ServerEntry subentry = subentries.get();
-                LdapDN dnName = subentry.getDn();
+                DN dnName = subentry.getDn();
 
                 String subtree = subentry.get( SchemaConstants.SUBTREE_SPECIFICATION_AT ).getString();
                 SubtreeSpecification ss;
@@ -321,7 +321,7 @@
      * @return the set of subentry op attrs for an entry
      * @throws Exception if there are problems accessing entry information
      */
-    public ServerEntry getSubentryAttributes( LdapDN dn, ServerEntry entryAttrs ) throws Exception
+    public ServerEntry getSubentryAttributes( DN dn, ServerEntry entryAttrs ) throws Exception
     {
         ServerEntry subentryAttrs = new DefaultServerEntry( schemaManager, dn );
         Iterator<String> list = subentryCache.nameIterator();
@@ -329,8 +329,8 @@
         while ( list.hasNext() )
         {
             String subentryDnStr = list.next();
-            LdapDN subentryDn = new LdapDN( subentryDnStr );
-            LdapDN apDn = ( LdapDN ) subentryDn.clone();
+            DN subentryDn = new DN( subentryDnStr );
+            DN apDn = ( DN ) subentryDn.clone();
             apDn.remove( apDn.size() - 1 );
             Subentry subentry = subentryCache.getSubentry( subentryDnStr );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
@@ -400,7 +400,7 @@
 
     public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
     {
-        LdapDN name = addContext.getDn();
+        DN name = addContext.getDn();
         ClonedServerEntry entry = addContext.getEntry();
 
         EntryAttribute objectClasses = entry.get( SchemaConstants.OBJECT_CLASS_AT );
@@ -408,7 +408,7 @@
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
             // get the name of the administrative point and its administrativeRole attributes
-            LdapDN apName = ( LdapDN ) name.clone();
+            DN apName = ( DN ) name.clone();
             apName.remove( name.size() - 1 );
             ServerEntry ap = addContext.lookup( apName, ByPassConstants.LOOKUP_BYPASS );
             EntryAttribute administrativeRole = ap.get( "administrativeRole" );
@@ -464,7 +464,7 @@
              * operational attributes calculated above.
              * ----------------------------------------------------------------
              */
-            LdapDN baseDn = ( LdapDN ) apName.clone();
+            DN baseDn = ( DN ) apName.clone();
             baseDn.addAll( ss.getBase() );
 
             ExprNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID ); // (objectClass=*)
@@ -479,7 +479,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -500,8 +500,8 @@
             while ( list.hasNext() )
             {
                 String subentryDnStr = list.next();
-                LdapDN subentryDn = new LdapDN( subentryDnStr );
-                LdapDN apDn = ( LdapDN ) subentryDn.clone();
+                DN subentryDn = new DN( subentryDnStr );
+                DN apDn = ( DN ) subentryDn.clone();
                 apDn.remove( apDn.size() - 1 );
                 Subentry subentry = subentryCache.getSubentry( subentryDnStr );
                 SubtreeSpecification ss = subentry.getSubtreeSpecification();
@@ -583,7 +583,7 @@
 
     public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
         ServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
         EntryAttribute objectClasses = entry.get( objectClassType );
 
@@ -600,9 +600,9 @@
              * attributes we remove from the entry in a modify operation.
              * ----------------------------------------------------------------
              */
-            LdapDN apName = ( LdapDN ) name.clone();
+            DN apName = ( DN ) name.clone();
             apName.remove( name.size() - 1 );
-            LdapDN baseDn = ( LdapDN ) apName.clone();
+            DN baseDn = ( DN ) apName.clone();
             baseDn.addAll( ss.getBase() );
 
             ExprNode filter = new PresenceNode( schemaManager.getAttributeTypeRegistry().getOidByName( SchemaConstants.OBJECT_CLASS_AT ) );
@@ -617,7 +617,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = new LdapDN( candidate.getDn() );
+                DN dn = new DN( candidate.getDn() );
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -647,7 +647,7 @@
      * are, false otherwise
      * @throws Exception if there are errors while searching the directory
      */
-    private boolean hasAdministrativeDescendant( OperationContext opContext, LdapDN name ) throws Exception
+    private boolean hasAdministrativeDescendant( OperationContext opContext, DN name ) throws Exception
     {
         ExprNode filter = new PresenceNode( "administrativeRole" );
         SearchControls controls = new SearchControls();
@@ -688,7 +688,7 @@
         while ( subentries.hasNext() )
         {
             String subentryDn = subentries.next();
-            Name apDn = new LdapDN( subentryDn );
+            Name apDn = new DN( subentryDn );
             apDn.remove( apDn.size() - 1 );
             SubtreeSpecification ss = subentryCache.getSubentry( subentryDn ).getSubtreeSpecification();
             boolean isOldNameSelected = evaluator.evaluate( ss, apDn, oldName, entry );
@@ -741,7 +741,7 @@
 
     public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
 
         ServerEntry entry = (ServerEntry)opContext.getEntry().getClonedEntry();
 
@@ -752,11 +752,11 @@
             // @Todo To be reviewed !!!
             Subentry subentry = subentryCache.getSubentry( name.toNormName() );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            LdapDN apName = ( LdapDN ) name.clone();
+            DN apName = ( DN ) name.clone();
             apName.remove( apName.size() - 1 );
-            LdapDN baseDn = ( LdapDN ) apName.clone();
+            DN baseDn = ( DN ) apName.clone();
             baseDn.addAll( ss.getBase() );
-            LdapDN newName = ( LdapDN ) name.clone();
+            DN newName = ( DN ) name.clone();
             newName.remove( newName.size() - 1 );
 
             newName.add( opContext.getNewRdn() );
@@ -777,7 +777,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
 
@@ -801,7 +801,7 @@
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            LdapDN newName = opContext.getNewDn();
+            DN newName = opContext.getNewDn();
 
             List<Modification> mods = getModsOnEntryRdnChange( name, newName, entry );
 
@@ -815,8 +815,8 @@
 
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) throws Exception
     {
-        LdapDN oriChildName = opContext.getDn();
-        LdapDN parent = opContext.getParent();
+        DN oriChildName = opContext.getDn();
+        DN parent = opContext.getParent();
 
         ServerEntry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
 
@@ -826,11 +826,11 @@
         {
             Subentry subentry = subentryCache.getSubentry( oriChildName.toNormName() );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            LdapDN apName = ( LdapDN ) oriChildName.clone();
+            DN apName = ( DN ) oriChildName.clone();
             apName.remove( apName.size() - 1 );
-            LdapDN baseDn = ( LdapDN ) apName.clone();
+            DN baseDn = ( DN ) apName.clone();
             baseDn.addAll( ss.getBase() );
-            LdapDN newName = ( LdapDN ) parent.clone();
+            DN newName = ( DN ) parent.clone();
             newName.remove( newName.size() - 1 );
 
             newName.add( opContext.getNewRdn() );
@@ -852,7 +852,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -875,7 +875,7 @@
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            LdapDN newName = ( LdapDN ) parent.clone();
+            DN newName = ( DN ) parent.clone();
             newName.add( opContext.getNewRdn() );
             newName.normalize( schemaManager.getNormalizerMapping() );
             List<Modification> mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
@@ -890,8 +890,8 @@
 
     public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
     {
-        LdapDN oriChildName = opContext.getDn();
-        LdapDN newParentName = opContext.getParent();
+        DN oriChildName = opContext.getDn();
+        DN newParentName = opContext.getParent();
 
         ServerEntry entry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
 
@@ -901,11 +901,11 @@
         {
             Subentry subentry = subentryCache.getSubentry( oriChildName.toString() );
             SubtreeSpecification ss = subentry.getSubtreeSpecification();
-            LdapDN apName = ( LdapDN ) oriChildName.clone();
+            DN apName = ( DN ) oriChildName.clone();
             apName.remove( apName.size() - 1 );
-            LdapDN baseDn = ( LdapDN ) apName.clone();
+            DN baseDn = ( DN ) apName.clone();
             baseDn.addAll( ss.getBase() );
-            LdapDN newName = ( LdapDN ) newParentName.clone();
+            DN newName = ( DN ) newParentName.clone();
             newName.remove( newName.size() - 1 );
             newName.add( newParentName.get( newParentName.size() - 1 ) );
 
@@ -926,7 +926,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ss, apName, dn, candidate ) )
@@ -949,7 +949,7 @@
 
             // calculate the new DN now for use below to modify subentry operational
             // attributes contained within this regular entry with name changes
-            LdapDN newName = ( LdapDN ) newParentName.clone();
+            DN newName = ( DN ) newParentName.clone();
             newName.add( oriChildName.get( oriChildName.size() - 1 ) );
             List<Modification> mods = getModsOnEntryRdnChange( oriChildName, newName, entry );
 
@@ -998,7 +998,7 @@
             }
         }
 
-        ServerEntry attrs = new DefaultServerEntry( schemaManager, LdapDN.EMPTY_LDAPDN );
+        ServerEntry attrs = new DefaultServerEntry( schemaManager, DN.EMPTY_DN );
         attrs.put( ocFinalState );
         return getSubentryTypes( attrs );
     }
@@ -1006,7 +1006,7 @@
 
     public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
         List<Modification> mods = opContext.getModItems();
 
         ServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
@@ -1045,9 +1045,9 @@
             next.modify( opContext );
 
             // search for all entries selected by the old SS and remove references to subentry
-            LdapDN apName = ( LdapDN ) name.clone();
+            DN apName = ( DN ) name.clone();
             apName.remove( apName.size() - 1 );
-            LdapDN oldBaseDn = ( LdapDN ) apName.clone();
+            DN oldBaseDn = ( DN ) apName.clone();
             oldBaseDn.addAll( ssOld.getBase() );
             ExprNode filter = new PresenceNode( schemaManager.getAttributeTypeRegistry().getOidByName( SchemaConstants.OBJECT_CLASS_AT ) );
             SearchControls controls = new SearchControls();
@@ -1060,7 +1060,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ssOld, apName, dn, candidate ) )
@@ -1073,7 +1073,7 @@
             // search for all selected entries by the new SS and add references to subentry
             Subentry subentry = subentryCache.getSubentry( name.toNormName() );
             ServerEntry operational = getSubentryOperatationalAttributes( name, subentry );
-            LdapDN newBaseDn = ( LdapDN ) apName.clone();
+            DN newBaseDn = ( DN ) apName.clone();
             newBaseDn.addAll( ssNew.getBase() );
             subentries = nexus.search( new SearchOperationContext( opContext.getSession(), newBaseDn,
                 AliasDerefMode.NEVER_DEREF_ALIASES, filter, controls ) );
@@ -1081,7 +1081,7 @@
             while ( subentries.next() )
             {
                 ServerEntry candidate = subentries.get();
-                LdapDN dn = candidate.getDn();
+                DN dn = candidate.getDn();
                 dn.normalize( schemaManager.getNormalizerMapping() );
 
                 if ( evaluator.evaluate( ssNew, apName, dn, candidate ) )
@@ -1209,7 +1209,7 @@
      * @param subentry the subentry to get attributes from
      * @return the set of attributes to be added or removed from entries
      */
-    private ServerEntry getSubentryOperatationalAttributes( LdapDN name, Subentry subentry ) throws Exception
+    private ServerEntry getSubentryOperatationalAttributes( DN name, Subentry subentry ) throws Exception
     {
         ServerEntry operational = new DefaultServerEntry( schemaManager, name );
 
@@ -1275,7 +1275,7 @@
      * @return the set of modifications required to remove an entry's reference to
      * a subentry
      */
-    private List<Modification> getOperationalModsForRemove( LdapDN subentryDn, ServerEntry candidate )
+    private List<Modification> getOperationalModsForRemove( DN subentryDn, ServerEntry candidate )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
@@ -1371,7 +1371,7 @@
                 return !objectClasses.contains( SchemaConstants.SUBENTRY_OC );
             }
 
-            LdapDN ndn = new LdapDN( dn );
+            DN ndn = new DN( dn );
             ndn.normalize( schemaManager.getNormalizerMapping() );
             String normalizedDn = ndn.toString();
             return !subentryCache.hasSubentry( normalizedDn );
@@ -1403,14 +1403,14 @@
                 return objectClasses.contains( SchemaConstants.SUBENTRY_OC );
             }
 
-            LdapDN ndn = new LdapDN( dn );
+            DN ndn = new DN( dn );
             ndn.normalize( schemaManager.getNormalizerMapping() );
             return subentryCache.hasSubentry( ndn.toNormName() );
         }
     }
 
 
-    private List<Modification> getModsOnEntryModification( LdapDN name, ServerEntry oldEntry, ServerEntry newEntry )
+    private List<Modification> getModsOnEntryModification( DN name, ServerEntry oldEntry, ServerEntry newEntry )
         throws Exception
     {
         List<Modification> modList = new ArrayList<Modification>();
@@ -1420,7 +1420,7 @@
         while ( subentries.hasNext() )
         {
             String subentryDn = subentries.next();
-            Name apDn = new LdapDN( subentryDn );
+            Name apDn = new DN( subentryDn );
             apDn.remove( apDn.size() - 1 );
             SubtreeSpecification ss = subentryCache.getSubentry( subentryDn ).getSubtreeSpecification();
             boolean isOldEntrySelected = evaluator.evaluate( ss, apDn, name, oldEntry );

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -28,7 +28,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.event.Evaluator;
 import org.apache.directory.server.core.event.ExpressionEvaluator;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
@@ -75,7 +75,7 @@
         throws NamingException
     {
         // TODO: Try to make this cast unnecessary.
-        LdapDN entryLdapDn = (LdapDN) entryDn;
+        DN dnEntryDn = (DN) entryDn;
         
         /* =====================================================================
          * NOTE: Regarding the overall approach, we try to narrow down the
@@ -101,7 +101,7 @@
         }
         else if ( apDn.equals( entryDn ) )
         {
-            apRelativeRdn = new LdapDN();
+            apRelativeRdn = new DN();
         }
         else
         {
@@ -122,7 +122,7 @@
         }
         else if ( apRelativeRdn.equals( subtree.getBase() ) )
         {
-            baseRelativeRdn = new LdapDN();
+            baseRelativeRdn = new DN();
         }
         else if ( !NamespaceTools.isDescendant( subtree.getBase(), apRelativeRdn ) )
         {
@@ -195,7 +195,7 @@
          */
         if ( subtree.getRefinement() != null )
         {
-            return evaluator.evaluate( subtree.getRefinement(), entryLdapDn.toNormName(), entry );
+            return evaluator.evaluate( subtree.getRefinement(), dnEntryDn.toNormName(), entry );
         }
 
         /*

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -32,7 +32,7 @@
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+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;
 
@@ -55,7 +55,7 @@
     protected Name getOperationPrincipal() throws NamingException
     {
         Principal principal = opContext.getSession().getEffectivePrincipal();
-        Name userName = new LdapDN( principal.getName() );
+        Name userName = new DN( principal.getName() );
         return userName;
     }
     
@@ -110,7 +110,7 @@
         public Object inject(  OperationContext opContext, StoredProcedureParameter param ) throws Exception
         {
             Generic_LDAP_CONTEXT ldapCtxParam = ( Generic_LDAP_CONTEXT ) param;
-            LdapDN 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -26,17 +26,17 @@
 
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class AddStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private LdapDN addedEntryName;
+    private DN addedEntryName;
     private ServerEntry addedEntry;
     
     
-    public AddStoredProcedureParameterInjector( OperationContext opContext, LdapDN addedEntryName, 
+    public AddStoredProcedureParameterInjector( OperationContext opContext, DN addedEntryName, 
         ServerEntry addedEntry )
     {
         super( opContext );
@@ -53,7 +53,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( addedEntryName.getName() );
+            return new DN( addedEntryName.getName() );
         }
     };
     

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -28,17 +28,17 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class DeleteStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private LdapDN deletedEntryName;
+    private DN deletedEntryName;
     private ServerEntry deletedEntry;
 
     
-    public DeleteStoredProcedureParameterInjector( OperationContext opContext, LdapDN deletedEntryName ) 
+    public DeleteStoredProcedureParameterInjector( OperationContext opContext, DN deletedEntryName ) 
         throws Exception
     {
         super( opContext );
@@ -54,7 +54,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws Exception
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( deletedEntryName.getName() );
+            return new DN( deletedEntryName.getName() );
         }
     };
     

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -25,7 +25,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
@@ -33,16 +33,16 @@
 public class ModifyDNStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
     private boolean deleteOldRn;
-    private LdapDN oldRDN;
+    private DN oldRDN;
     private RDN newRDN;
-    private LdapDN oldSuperiorDN;
-    private LdapDN newSuperiorDN;
-    private LdapDN oldDN;
-    private LdapDN newDN;
+    private DN oldSuperiorDN;
+    private DN newSuperiorDN;
+    private DN oldDN;
+    private DN newDN;
 
 
     public ModifyDNStoredProcedureParameterInjector( OperationContext opContext, boolean deleteOldRn,
-        LdapDN oldRDN, RDN newRDN, LdapDN oldSuperiorDN, LdapDN newSuperiorDN, LdapDN oldDN, LdapDN newDN)
+        DN oldRDN, RDN newRDN, DN oldSuperiorDN, DN newSuperiorDN, DN oldDN, DN newDN)
     {
         super( opContext );
         this.deleteOldRn = deleteOldRn;
@@ -71,7 +71,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( oldDN.getName() );
+            return new DN( oldDN.getName() );
         }
     };
 
@@ -83,7 +83,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( newRDN.getUpName() );
+            return new DN( newRDN.getUpName() );
         }
     };
 
@@ -107,7 +107,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( newSuperiorDN.getName() );
+            return new DN( newSuperiorDN.getName() );
         }
     };
     
@@ -119,7 +119,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( oldRDN.getName() );
+            return new DN( oldRDN.getName() );
         }
     };
     
@@ -131,7 +131,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( oldSuperiorDN.getName() );
+            return new DN( oldSuperiorDN.getName() );
         }
     };
     
@@ -143,7 +143,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( newDN.getName() );
+            return new DN( 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -32,13 +32,13 @@
 import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.partition.ByPassConstants;
 import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 
 
 public class ModifyStoredProcedureParameterInjector extends AbstractStoredProcedureParameterInjector
 {
-    private LdapDN modifiedEntryName;
+    private DN modifiedEntryName;
     private List<Modification> modifications;
     private ServerEntry oldEntry;
     
@@ -62,7 +62,7 @@
         public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
         {
             // Return a safe copy constructed with user provided name.
-            return new LdapDN( modifiedEntryName.getName() );
+            return new DN( modifiedEntryName.getName() );
         }
     };
     

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -25,18 +25,18 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 public class SimpleTriggerExecutionAuthorizer implements TriggerExecutionAuthorizer
 {
-    private static LdapDN adminName;
+    private static DN adminName;
     
     static
     {
         try
         {
-            adminName = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+            adminName = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
         }
         catch ( InvalidNameException e )
         {
@@ -47,7 +47,7 @@
     
     public boolean hasPermission( OperationContext opContext ) throws NamingException
     {
-        LdapDN principalName = opContext.getSession().getEffectivePrincipal().getClonedName();
+        DN principalName = opContext.getSession().getEffectivePrincipal().getClonedName();
         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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -52,7 +52,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -115,7 +115,7 @@
      * @param proxy the partition nexus proxy 
      */
     private void addPrescriptiveTriggerSpecs( OperationContext opContext, List<TriggerSpecification> triggerSpecs, 
-        LdapDN dn, ServerEntry entry ) throws Exception
+        DN dn, ServerEntry entry ) throws Exception
     {
         
         /*
@@ -129,7 +129,7 @@
          */
         if ( entry.contains( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.SUBENTRY_OC ) )
         {
-            LdapDN parentDn = ( LdapDN ) dn.clone();
+            DN parentDn = ( DN ) dn.clone();
             parentDn.remove( dn.size() - 1 );
             
             entry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
@@ -257,7 +257,7 @@
     
     public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
     {
-        LdapDN name = addContext.getDn();
+        DN name = addContext.getDn();
         ServerEntry entry = addContext.getEntry();
         
         // Bypass trigger handling if the service is disabled.
@@ -292,7 +292,7 @@
     
     public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws Exception
     {
-        LdapDN name = deleteContext.getDn();
+        DN name = deleteContext.getDn();
         
         // Bypass trigger handling if the service is disabled.
         if ( !enabled )
@@ -332,7 +332,7 @@
             return;
         }
         
-        LdapDN normName = opContext.getDn();
+        DN normName = opContext.getDn();
         
         // Gather supplementary data.
         ClonedServerEntry modifiedEntry = opContext.lookup( normName, ByPassConstants.LOOKUP_BYPASS );
@@ -357,7 +357,7 @@
 
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws Exception
     {
-        LdapDN name = renameContext.getDn();
+        DN name = renameContext.getDn();
         RDN newRdn = renameContext.getNewRdn();
         boolean deleteOldRn = renameContext.getDelOldDn();
         
@@ -372,12 +372,12 @@
         ServerEntry renamedEntry = (ServerEntry)renameContext.getEntry().getClonedEntry();
         
         // @TODO : To be completely reviewed !!!
-        LdapDN oldRDN = new LdapDN( name.getRdn().getUpName() );
-        LdapDN oldSuperiorDN = ( LdapDN ) name.clone();
+        DN oldRDN = new DN( name.getRdn().getUpName() );
+        DN oldSuperiorDN = ( DN ) name.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
-        LdapDN newSuperiorDN = ( LdapDN ) oldSuperiorDN.clone();
-        LdapDN oldDN = ( LdapDN ) name.clone();
-        LdapDN newDN = ( LdapDN ) name.clone();
+        DN newSuperiorDN = ( DN ) oldSuperiorDN.clone();
+        DN oldDN = ( DN ) name.clone();
+        DN newDN = ( DN ) name.clone();
         newDN.add( newRdn );
         
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector(
@@ -403,8 +403,8 @@
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext opContext ) 
         throws Exception
     {
-        LdapDN oriChildName = opContext.getDn();
-        LdapDN parent = opContext.getParent();
+        DN oriChildName = opContext.getDn();
+        DN parent = opContext.getParent();
         RDN newRdn = opContext.getNewRdn();
         boolean deleteOldRn = opContext.getDelOldDn();
 
@@ -418,12 +418,12 @@
         // Gather supplementary data.        
         ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
         
-        LdapDN oldRDN = new LdapDN( oriChildName.getRdn().getUpName() );
-        LdapDN oldSuperiorDN = ( LdapDN ) oriChildName.clone();
+        DN oldRDN = new DN( oriChildName.getRdn().getUpName() );
+        DN oldSuperiorDN = ( DN ) oriChildName.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
-        LdapDN newSuperiorDN = ( LdapDN ) parent.clone();
-        LdapDN oldDN = ( LdapDN ) oriChildName.clone();
-        LdapDN newDN = ( LdapDN ) parent.clone();
+        DN newSuperiorDN = ( DN ) parent.clone();
+        DN oldDN = ( DN ) oriChildName.clone();
+        DN newDN = ( DN ) parent.clone();
         newDN.add( newRdn.getUpName() );
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector(
@@ -486,19 +486,19 @@
             return;
         }
         
-        LdapDN oriChildName = opContext.getDn();
-        LdapDN newParentName = opContext.getParent();
+        DN oriChildName = opContext.getDn();
+        DN newParentName = opContext.getParent();
         
         // Gather supplementary data.        
         ClonedServerEntry movedEntry = opContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
         
-        LdapDN oldRDN = new LdapDN( oriChildName.getRdn().getUpName() );
+        DN oldRDN = new DN( oriChildName.getRdn().getUpName() );
         RDN newRDN = new RDN( oriChildName.getRdn().getUpName() );
-        LdapDN oldSuperiorDN = ( LdapDN ) oriChildName.clone();
+        DN oldSuperiorDN = ( DN ) oriChildName.clone();
         oldSuperiorDN.remove( oldSuperiorDN.size() - 1 );
-        LdapDN newSuperiorDN = ( LdapDN ) newParentName.clone();
-        LdapDN oldDN = ( LdapDN ) oriChildName.clone();
-        LdapDN newDN = ( LdapDN ) newParentName.clone();
+        DN newSuperiorDN = ( DN ) newParentName.clone();
+        DN oldDN = ( DN ) oriChildName.clone();
+        DN newDN = ( DN ) newParentName.clone();
         newDN.add( newRDN.getUpName() );
 
         StoredProcedureParameterInjector injector = new ModifyDNStoredProcedureParameterInjector(

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -53,7 +53,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.NormalizerMappingResolver;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -118,13 +118,13 @@
         
         for ( String suffix:suffixes )
         {
-            LdapDN baseDn = new LdapDN( suffix );
+            DN baseDn = new DN( suffix );
             ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
                     new ClientStringValue( ApacheSchemaConstants.TRIGGER_EXECUTION_SUBENTRY_OC ) );
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             
-            LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+            DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
             adminDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
             CoreSession adminSession = new DefaultCoreSession( 
                 new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), directoryService );
@@ -134,7 +134,7 @@
             while ( results.next() )
             {
                 ClonedServerEntry resultEntry = results.get();
-                LdapDN subentryDn = resultEntry.getDn();
+                DN subentryDn = resultEntry.getDn();
                 EntryAttribute triggerSpec = resultEntry.get( PRESCRIPTIVE_TRIGGER_ATTR );
                 
                 if ( triggerSpec == null )
@@ -143,7 +143,7 @@
                     continue;
                 }
 
-                LdapDN normSubentryName = subentryDn.normalize( directoryService.getSchemaManager()
+                DN normSubentryName = subentryDn.normalize( directoryService.getSchemaManager()
                     .getNormalizerMapping() );
                 subentryAdded( normSubentryName, resultEntry );
             }
@@ -162,7 +162,7 @@
     }
 
 
-    public void subentryAdded( LdapDN normName, ServerEntry entry ) throws Exception
+    public void subentryAdded( DN normName, ServerEntry entry ) throws Exception
     {
         // only do something if the entry contains prescriptiveTrigger
         EntryAttribute triggerSpec = entry.get( PRESCRIPTIVE_TRIGGER_ATTR );
@@ -195,7 +195,7 @@
     }
 
 
-    public void subentryDeleted( LdapDN normName, ServerEntry entry ) throws Exception
+    public void subentryDeleted( DN normName, ServerEntry entry ) throws Exception
     {
         if ( !hasPrescriptiveTrigger( entry ) )
         {
@@ -213,7 +213,7 @@
             return;
         }
 
-        LdapDN normName = opContext.getDn();
+        DN normName = opContext.getDn();
         List<Modification> mods = opContext.getModItems();
 
         boolean isTriggerSpecModified = false;
@@ -242,7 +242,7 @@
     }
 
 
-    public void subentryRenamed( LdapDN oldName, LdapDN newName )
+    public void subentryRenamed( DN oldName, DN newName )
     {
         triggerSpecs.put( newName.toString(), triggerSpecs.remove( oldName.toString() ) );
     }

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -89,7 +89,7 @@
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.junit.BeforeClass;
@@ -110,8 +110,8 @@
 
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
 
-    private static final LdapDN ROOTDSE_NAME = new LdapDN();
-    private static LdapDN 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 ServerEntry ENTRY;
     
@@ -124,7 +124,7 @@
     {
         service = new DefaultDirectoryService();
 
-        ENTRY_NAME = new LdapDN( "ou=test, ou=system" );
+        ENTRY_NAME = new DN( "ou=test, ou=system" );
         PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) );
         ENTRY = new DefaultServerEntry( service.getSchemaManager(), ENTRY_NAME );
     }
@@ -214,7 +214,7 @@
         public MockOperation( int count ) throws Exception 
         {
             this.count = count;
-            this.session = new DefaultCoreSession( new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), 
+            this.session = new DefaultCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), 
                 new MockDirectoryService( count ) );
         }
 
@@ -253,7 +253,7 @@
         }
 
 
-        public LdapDN getDn()
+        public DN getDn()
         {
             return null;
         }
@@ -337,7 +337,7 @@
         }
 
 
-        public ClonedServerEntry lookup( LdapDN dn, Collection<String> bypass ) throws Exception
+        public ClonedServerEntry lookup( DN dn, Collection<String> bypass ) throws Exception
         {
             return null;
         }
@@ -349,7 +349,7 @@
         }
 
 
-        public LookupOperationContext newLookupContext( LdapDN dn )
+        public LookupOperationContext newLookupContext( DN dn )
         {
             return null;
         }
@@ -365,7 +365,7 @@
         }
 
 
-        public void setDn( LdapDN dn )
+        public void setDn( DN dn )
         {
         }
 
@@ -411,17 +411,17 @@
         }
 
 
-        public void delete( LdapDN dn, Collection<String> bypass ) throws Exception
+        public void delete( DN dn, Collection<String> bypass ) throws Exception
         {
         }
 
 
-        public void modify( LdapDN dn, List<Modification> mods, Collection<String> bypass ) throws Exception
+        public void modify( DN dn, List<Modification> mods, Collection<String> bypass ) throws Exception
         {
         }
 
 
-        public boolean hasEntry( LdapDN dn, Collection<String> byPass ) throws Exception
+        public boolean hasEntry( DN dn, Collection<String> byPass ) throws Exception
         {
             return false;
         }
@@ -766,7 +766,7 @@
         }
 
 
-        public ServerEntry newEntry( LdapDN dn ) throws NamingException
+        public ServerEntry newEntry( DN dn ) throws NamingException
         {
             return null;
         }
@@ -795,13 +795,13 @@
         }
 
 
-        public CoreSession getSession( LdapDN principalDn, byte[] credentials ) throws Exception
+        public CoreSession getSession( DN principalDn, byte[] credentials ) throws Exception
         {
             return null;
         }
 
         
-        public CoreSession getSession( LdapDN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
+        public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
             throws Exception
         {
             return null;
@@ -920,7 +920,7 @@
         {
         }
 
-        public LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+        public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
         {
             return null;
         }
@@ -930,7 +930,7 @@
             return null;
         }
 
-        public LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+        public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
         {
             return null;
         }

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.aci.ProtectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
@@ -97,7 +97,7 @@
     @Before 
     public void setup() throws NamingException
     {
-        LdapDN entryName = new LdapDN( "ou=test, ou=system" );
+        DN entryName = new DN( "ou=test, ou=system" );
         ENTRY = new DefaultServerEntry( schemaManager, entryName );
         FULL_ENTRY = new DefaultServerEntry( 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -37,7 +37,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.junit.Test;
 
@@ -50,7 +50,7 @@
  */
 public class MostSpecificUserClassFilterTest
 {
-    private static final Set<LdapDN> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<LdapDN>() );
+    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 Collection<SubtreeSpecification> EMPTY_SUBTREE_SPECIFICATION_COLLECTION = Collections.unmodifiableCollection( new ArrayList<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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -47,7 +47,7 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
@@ -70,10 +70,10 @@
     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 LdapDN GROUP_NAME;
-    private static LdapDN USER_NAME;
-    private static Set<LdapDN> USER_NAMES = new HashSet<LdapDN>();
-    private static Set<LdapDN> GROUP_NAMES = new HashSet<LdapDN>();
+    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;
     //private static AttributeTypeRegistry atRegistryA;
@@ -103,8 +103,8 @@
 
         OID_REGISTRY = schemaManager.getGlobalOidRegistry();
 
-        GROUP_NAME = new LdapDN( "ou=test,ou=groups,ou=system" );
-        USER_NAME = new LdapDN( "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(
             OID_REGISTRY ) ), new ExpressionEvaluator( OID_REGISTRY, schemaManager ), OID_REGISTRY, schemaManager );
@@ -303,11 +303,11 @@
         Collection<ACITuple> tuples = getTuples( new ProtectedItem.RangeOfValues( new PresenceNode( "cn" ) ) );
 
         Assert.assertEquals( 1, filterA.filter( tuples, OperationScope.ENTRY, null, null, USER_NAME, null, null,
-            new LdapDN( "ou=testEntry" ), null, null, entry, null ).size() );
+            new DN( "ou=testEntry" ), null, null, entry, null ).size() );
 
         entry.remove( "cn" );
         Assert.assertEquals( 0, filterA.filter( service.getRegistries(), tuples, OperationScope.ATTRIBUTE_TYPE_AND_VALUE, null, null, USER_NAME,
-            null, null, new LdapDN( "ou=testEntry" ), null, null, entry, null ).size() );
+            null, null, new DN( "ou=testEntry" ), null, null, entry, null ).size() );
     }
     */
 

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -36,7 +36,7 @@
 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.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -55,10 +55,10 @@
 
     private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET = Collections.unmodifiableSet( new HashSet<MicroOperation>() );
 
-    private static LdapDN GROUP_NAME;
-    private static LdapDN USER_NAME;
-    private static final Set<LdapDN> USER_NAMES = new HashSet<LdapDN>();
-    private static final Set<LdapDN> GROUP_NAMES = new HashSet<LdapDN>();
+    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;
 
@@ -72,8 +72,8 @@
         
         try
         {
-            GROUP_NAME = new LdapDN( "ou=test,ou=groups,ou=system" );
-            USER_NAME = new LdapDN( "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 ( NamingException e )
         {
@@ -111,7 +111,7 @@
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
             AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
         assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
-            AuthenticationLevel.NONE, new LdapDN( "ou=unrelated" ), null, null, null, null, null ).size() );
+            AuthenticationLevel.NONE, new DN( "ou=unrelated" ), null, null, null, null, null ).size() );
     }
     
     
@@ -121,9 +121,9 @@
         Collection<ACITuple> tuples = getTuples( UserClass.PARENT_OF_ENTRY );
 
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
-            AuthenticationLevel.NONE, new LdapDN( "ou=phoneBook, ou=test, ou=users, ou=system" ), null, null, null, null, null ).size() );
+            AuthenticationLevel.NONE, new DN( "ou=phoneBook, ou=test, ou=users, ou=system" ), null, null, null, null, null ).size() );
         assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
-            AuthenticationLevel.NONE, new LdapDN( "ou=unrelated" ), null, null, null, null, null ).size() );
+            AuthenticationLevel.NONE, new DN( "ou=unrelated" ), null, null, null, null, null ).size() );
     }
 
 
@@ -134,7 +134,7 @@
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, null, USER_NAME, null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
         assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, null,
-            new LdapDN( "ou=unrelateduser, ou=users" ), null, AuthenticationLevel.NONE, USER_NAME, null, null, null,
+            new DN( "ou=unrelateduser, ou=users" ), null, AuthenticationLevel.NONE, USER_NAME, null, null, null,
             null, null ).size() );
     }
 
@@ -146,8 +146,8 @@
         assertEquals( 1, filter.filter( null, tuples, OperationScope.ENTRY, null, GROUP_NAMES, USER_NAME, null,
             AuthenticationLevel.NONE, null, null, null, null, null, null ).size() );
 
-        Set<LdapDN> wrongGroupNames = new HashSet<LdapDN>();
-        wrongGroupNames.add( new LdapDN( "ou=unrelatedgroup" ) );
+        Set<DN> wrongGroupNames = new HashSet<DN>();
+        wrongGroupNames.add( new DN( "ou=unrelatedgroup" ) );
 
         assertEquals( 0, filter.filter( null, tuples, OperationScope.ENTRY, null, wrongGroupNames, USER_NAME, null,
             AuthenticationLevel.NONE, USER_NAME, null, null, null, null, null ).size() );
@@ -211,11 +211,11 @@
         }
         else
         {
-            Set<LdapDN> names = new HashSet<LdapDN>();
+            Set<DN> names = new HashSet<DN>();
             
             try
             {
-                names.add( new LdapDN( "dummy=dummy" ) );
+                names.add( new DN( "dummy=dummy" ) );
             }
             catch ( NamingException 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.ldap.aci.ProtectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
@@ -89,7 +89,7 @@
             fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) );
         }
 
-        LdapDN entryName = new LdapDN( "ou=test, ou=system" );
+        DN entryName = new DN( "ou=test, ou=system" );
         PROTECTED_ITEMS.add( new ProtectedItem.MaxImmSub( 2 ) );
         ENTRY = new DefaultServerEntry( 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -36,7 +36,7 @@
 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.LdapDN;
+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.ldap.util.DateUtils;
@@ -103,7 +103,7 @@
         forward.putAttribute( "objectClass", "organizationalUnit" );
         forward.putAttribute( "ou", "system" );
 
-        LdifEntry reverse = LdifRevertor.reverseAdd( new LdapDN( forward.getDn() ) );
+        LdifEntry reverse = LdifRevertor.reverseAdd( new DN( forward.getDn() ) );
         assertEquals( 1, store.log( new LdapPrincipal(), forward, reverse ).getRevision() );
         assertEquals( 1, store.getCurrentRevision() );
     }
@@ -112,10 +112,10 @@
     @Test
     public void testChangeLogSerialization() throws NamingException, IOException, ClassNotFoundException
     {
-        LdapDN systemDn = new LdapDN( "ou=system" );
+        DN systemDn = new DN( "ou=system" );
         systemDn.normalize( oidsMap );
         
-        LdapDN adminDn = new LdapDN( "uid=admin, ou=system" );
+        DN adminDn = new DN( "uid=admin, ou=system" );
         adminDn.normalize( oidsMap );
 
         LdifEntry forward = new LdifEntry();
@@ -124,7 +124,7 @@
         forward.putAttribute( "objectClass", "organizationalUnit" );
         forward.putAttribute( "ou", "system" );
         
-        LdapDN reverseDn = new LdapDN( 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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -53,7 +53,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.csn.Csn;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.junit.After;
@@ -107,10 +107,10 @@
     @Test
     public void testNoBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         InvocationStack.getInstance().push( opContext );
 
@@ -133,10 +133,10 @@
     @Test
     public void testSingleBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         opContext.setByPassed( Collections.singleton( "0" ) );
         InvocationStack.getInstance().push( opContext );
@@ -160,10 +160,10 @@
     @Test
     public void testAdjacentDoubleBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "0" );
@@ -190,10 +190,10 @@
     @Test
     public void testFrontAndBackDoubleBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "0" );
@@ -219,10 +219,10 @@
     @Test
     public void testDoubleBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         Set<String> bypass = new HashSet<String>();
         bypass.add( "1" );
@@ -248,10 +248,10 @@
     @Test
     public void testCompleteBypass() throws Exception
     {
-        LdapDN dn = new LdapDN( "ou=system" );
+        DN dn = new DN( "ou=system" );
         DirectoryService ds = new MockDirectoryService();
         DefaultCoreSession session = new DefaultCoreSession( 
-            new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), ds );
+            new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), ds );
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         opContext.setByPassed( ByPassConstants.BYPASS_ALL_COLLECTION );
         InvocationStack.getInstance().push( opContext );
@@ -400,7 +400,7 @@
         }
 
 
-        public LdapContext getJndiContext( LdapDN principalDn, String principal, byte[] credential,
+        public LdapContext getJndiContext( DN principalDn, String principal, byte[] credential,
             String authentication, String baseName ) throws NamingException
         {
             return null;
@@ -572,7 +572,7 @@
         }
 
 
-        public ServerEntry newEntry( LdapDN dn ) throws NamingException
+        public ServerEntry newEntry( DN dn ) throws NamingException
         {
             return null;
         }
@@ -602,13 +602,13 @@
         }
 
 
-        public CoreSession getSession( LdapDN principalDn, byte[] credentials ) throws Exception
+        public CoreSession getSession( DN principalDn, byte[] credentials ) throws Exception
         {
             return null;
         }
 
 
-        public CoreSession getSession( LdapDN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
+        public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
             throws Exception
         {
             return null;

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java Wed Mar  3 23:25:11 2010
@@ -42,7 +42,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 import javax.naming.NamingException;
 import java.util.Set;
@@ -90,14 +90,14 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
     {
         test.interceptors.add( this );
         return next.getMatchedName( opContext );
     }
 
 
-    public LdapDN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
     {
         test.interceptors.add( this );
         return next.getSuffix( opContext );

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -24,7 +24,7 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.prefs.PreferencesUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -53,7 +53,7 @@
         
         String test = "/org/apache/kerberos/";
 
-        LdapDN dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
+        DN dn = ( DN ) PreferencesUtils.toSysDn( test );
 
         assertEquals( expectedDN, dn.getName() );
 
@@ -61,7 +61,7 @@
 
         test = "/org/apache/kerberos";
 
-        dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
+        dn = ( DN ) PreferencesUtils.toSysDn( test );
 
         assertEquals( expectedDN, dn.getName() );
 
@@ -69,7 +69,7 @@
 
         test = "/";
 
-        dn = ( LdapDN ) PreferencesUtils.toSysDn( test );
+        dn = ( DN ) PreferencesUtils.toSysDn( test );
 
         assertEquals( ServerDNConstants.SYSPREFROOT_SYSTEM_DN, dn.getName() );
 
@@ -77,7 +77,7 @@
 
         test = "//////";
 
-        dn = ( LdapDN ) 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/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Wed Mar  3 23:25:11 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -99,7 +99,7 @@
     @Test
     public void testPreventStructuralClassRemovalOnModifyReplace() throws Exception
     {
-        LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
+        DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE;
         ServerEntry modifyAttributes = new DefaultServerEntry( schemaManager );
         AttributeType atCN = schemaManager.lookupAttributeTypeRegistry( "cn" );
@@ -154,7 +154,7 @@
      *
     public void testPreventStructuralClassRemovalOnModifyRemove() throws Exception
     {
-        LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
+        DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         int mod = DirContext.REMOVE_ATTRIBUTE;
         Attributes modifyAttributes = new AttributesImpl( true );
         Attribute entryObjectClasses = new AttributeImpl( "objectClass" );
@@ -220,7 +220,7 @@
     public void testPreventRdnChangeOnModifyRemove() throws Exception
     {
         ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
-        LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
+        DN name = new DN( "ou=user,dc=example,dc=com" );
         ServerEntry attributes = new DefaultServerEntry( schemaManager, name );
         attributes.put( "cn", "does not matter" );
 
@@ -242,7 +242,7 @@
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
-        name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
+        name = new DN( "ou=users+cn=system users,dc=example,dc=com" );
         attributes = new DefaultServerEntry( schemaManager, name );
         attributes.put( "sn", "does not matter" );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, attributes, schemaManager );
@@ -290,7 +290,7 @@
     public void testPreventRdnChangeOnModifyReplace() throws Exception
     {
         ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE;
-        LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
+        DN name = new DN( "ou=user,dc=example,dc=com" );
         ServerEntry attributes = new DefaultServerEntry( schemaManager, name );
         attributes.put( "cn", "does not matter" );
 
@@ -311,7 +311,7 @@
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
-        name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
+        name = new DN( "ou=users+cn=system users,dc=example,dc=com" );
         attributes = new DefaultServerEntry( schemaManager, name );
         attributes.put( "sn", "does not matter" );
         SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, attributes, schemaManager );
@@ -366,7 +366,7 @@
         AttributeType CN_AT = schemaManager.lookupAttributeTypeRegistry( "cn" );
 
         // this should pass
-        LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
+        DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         ModificationOperation mod = ModificationOperation.REPLACE_ATTRIBUTE;
         SchemaChecker.preventStructuralClassRemovalOnModifyReplace( schemaManager, name, mod, new DefaultServerAttribute( "cn", CN_AT ) );
 
@@ -411,7 +411,7 @@
     @Test
     public void testPreventStructuralClassRemovalOnModifyRemoveAttribute() throws Exception
     {
-        LdapDN name = new LdapDN( "uid=akarasulu,ou=users,dc=example,dc=com" );
+        DN name = new DN( "uid=akarasulu,ou=users,dc=example,dc=com" );
         ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
         AttributeType ocAt = schemaManager.lookupAttributeTypeRegistry( "objectClass" );
         
@@ -474,7 +474,7 @@
     {
         Map<String, OidNormalizer> oidNormalizers = schemaManager.getAttributeTypeRegistry().getNormalizerMapping();
         ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
-        LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" ).normalize( oidNormalizers );
+        DN name = new DN( "ou=user,dc=example,dc=com" ).normalize( oidNormalizers );
         AttributeType cnAt = schemaManager.lookupAttributeTypeRegistry( "cn" );
         AttributeType ouAt = schemaManager.lookupAttributeTypeRegistry( "ou" );
         AttributeType snAt = schemaManager.lookupAttributeTypeRegistry( "sn" );
@@ -496,7 +496,7 @@
         }
 
         // test success using more than one attribute for the Rdn but not modifying rdn attribute
-        name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
+        name = new DN( "ou=users+cn=system users,dc=example,dc=com" );
         name.normalize( oidNormalizers );
         SchemaChecker.preventRdnChangeOnModifyRemove( name, mod, 
             new DefaultServerAttribute( "sn", snAt, "does not matter" ), schemaManager );
@@ -539,7 +539,7 @@
 //    public void testPreventRdnChangeOnModifyReplaceAttribute() throws Exception
 //    {
 //        int mod = DirContext.REPLACE_ATTRIBUTE;
-//        LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
+//        DN name = new DN( "ou=user,dc=example,dc=com" );
 //
 //        // postive test which should pass
 //        SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new AttributeImpl( "cn", "does not matter" ), registries.getOidRegistry() );
@@ -556,7 +556,7 @@
 //        }
 //
 //        // test success using more than one attribute for the Rdn but not modifying rdn attribute
-//        name = new LdapDN( "ou=users+cn=system users,dc=example,dc=com" );
+//        name = new DN( "ou=users+cn=system users,dc=example,dc=com" );
 //        SchemaChecker.preventRdnChangeOnModifyReplace( name, mod, new AttributeImpl( "sn", "does not matter" ), registries.getOidRegistry() );
 //
 //        // test for failure when modifying Rdn attribute in multi attribute Rdn

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=918766&r1=918765&r2=918766&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 Wed Mar  3 23:25:11 2010
@@ -30,7 +30,7 @@
 
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -92,7 +92,7 @@
     @Test
     public void testAll() throws Exception
     {
-        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, new LdapDN() );
+        DefaultServerEntry entry = new DefaultServerEntry( schemaManager, new DN() );
         TlsKeyGenerator.addKeyPair( entry );
         LOG.debug( "Entry: {}", entry );
         assertTrue( entry.contains( SchemaConstants.OBJECT_CLASS_AT, TlsKeyGenerator.TLS_KEY_INFO_OC ) );



Mime
View raw message