directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918766 [3/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-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java Wed Mar  3 23:25:11 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 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.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
@@ -77,7 +77,7 @@
     public boolean modify( ModifyOperationContext opContext, ServerEntry targetEntry, boolean cascade )
         throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
         ServerEntry entry = opContext.getEntry();
         String oid = getOid( entry );
         LdapSyntax syntax = factory.getSyntax( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -101,8 +101,8 @@
      */
     public void add( ServerEntry entry ) throws Exception
     {
-        LdapDN dn = entry.getDn();
-        LdapDN parentDn = ( LdapDN ) dn.clone();
+        DN dn = entry.getDn();
+        DN parentDn = ( DN ) dn.clone();
         parentDn.remove( parentDn.size() - 1 );
 
         // The parent DN must be ou=syntaxes,cn=<schemaName>,ou=schema
@@ -201,8 +201,8 @@
      */
     public void delete( ServerEntry entry, boolean cascade ) throws Exception
     {
-        LdapDN dn = entry.getDn();
-        LdapDN parentDn = ( LdapDN ) dn.clone();
+        DN dn = entry.getDn();
+        DN parentDn = ( DN ) dn.clone();
         parentDn.remove( parentDn.size() - 1 );
 
         // The parent DN must be ou=syntaxes,cn=<schemaName>,ou=schema
@@ -290,7 +290,7 @@
     }
 
 
-    public void moveAndRename( LdapDN oriChildName, LdapDN newParentName, RDN newRn, boolean deleteOldRn,
+    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
         ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
@@ -336,7 +336,7 @@
     }
 
 
-    public void move( LdapDN oriChildName, LdapDN newParentName, ServerEntry entry, boolean cascade ) throws Exception
+    public void move( DN oriChildName, DN newParentName, ServerEntry entry, boolean cascade ) throws Exception
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -379,7 +379,7 @@
     }
 
 
-    private void checkNewParent( LdapDN newParent ) throws NamingException
+    private void checkNewParent( DN newParent ) throws NamingException
     {
         if ( newParent.size() != 3 )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Wed Mar  3 23:25:11 2010
@@ -65,7 +65,7 @@
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -229,7 +229,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean compare( LdapDN dn, String oid, Object value ) throws Exception
+    public boolean compare( DN dn, String oid, Object value ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         
@@ -242,7 +242,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean compare( LdapDN dn, String oid, Object value, boolean ignoreReferral ) throws Exception
+    public boolean compare( DN dn, String oid, Object value, boolean ignoreReferral ) throws Exception
     {
         CompareOperationContext opContext =  
                 new CompareOperationContext( this, dn, oid, 
@@ -258,7 +258,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( LdapDN dn ) throws Exception
+    public void delete( DN dn ) throws Exception
     {
         delete( dn, LogChange.TRUE );
     }
@@ -267,7 +267,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( LdapDN dn, LogChange log ) throws Exception
+    public void delete( DN dn, LogChange log ) throws Exception
     {
         DeleteOperationContext opContext = new DeleteOperationContext( this, dn );
 
@@ -281,7 +281,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( LdapDN dn, boolean ignoreReferral  ) throws Exception
+    public void delete( DN dn, boolean ignoreReferral  ) throws Exception
     {
         delete( dn, ignoreReferral, LogChange.TRUE );
     }
@@ -290,7 +290,7 @@
     /**
      * {@inheritDoc}
      */
-    public void delete( LdapDN dn, boolean ignoreReferral, LogChange log ) throws Exception
+    public void delete( DN dn, boolean ignoreReferral, LogChange log ) throws Exception
     {
         DeleteOperationContext opContext = new DeleteOperationContext( this, dn );
         
@@ -439,9 +439,9 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set)
+     * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set)
      */
-    public EntryFilteringCursor list( LdapDN dn, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -451,9 +451,9 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
+     * @see org.apache.directory.server.core.CoreSession#list(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
-    public EntryFilteringCursor list( LdapDN dn, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
     {
         ListOperationContext opContext = new ListOperationContext( this, dn, aliasDerefMode, returningAttributes );
@@ -467,7 +467,7 @@
     /**
      * {@inheritDoc} 
      */
-    public ClonedServerEntry lookup( LdapDN dn ) throws Exception
+    public ClonedServerEntry lookup( DN dn ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         return operationManager.lookup( new LookupOperationContext( this, dn ) );
@@ -477,7 +477,7 @@
     /**
      * {@inheritDoc}
      */
-    public ClonedServerEntry lookup( LdapDN dn, String[] attrId ) throws Exception
+    public ClonedServerEntry lookup( DN dn, String[] attrId ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         return operationManager.lookup( 
@@ -488,7 +488,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( LdapDN dn, List<Modification> mods ) throws Exception
+    public void modify( DN dn, List<Modification> mods ) throws Exception
     {
         modify( dn, mods, LogChange.TRUE );
     }
@@ -497,7 +497,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( LdapDN dn, List<Modification> mods, LogChange log ) throws Exception
+    public void modify( DN dn, List<Modification> mods, LogChange log ) throws Exception
     {
         if ( mods == null )
         {
@@ -523,7 +523,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral ) throws Exception
+    public void modify( DN dn, List<Modification> mods, boolean ignoreReferral ) throws Exception
     {
         modify( dn, mods, ignoreReferral, LogChange.TRUE );
     }
@@ -532,7 +532,7 @@
     /**
      * {@inheritDoc}
      */
-    public void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception
+    public void modify( DN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception
     {
         if ( mods == null )
         {
@@ -559,7 +559,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( LdapDN dn, LdapDN newParent ) throws Exception
+    public void move( DN dn, DN newParent ) throws Exception
     {
         move( dn, newParent, LogChange.TRUE );
     }
@@ -568,7 +568,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( LdapDN dn, LdapDN newParent, LogChange log ) throws Exception
+    public void move( DN dn, DN newParent, LogChange log ) throws Exception
     {
         MoveOperationContext opContext = new MoveOperationContext( this, dn, newParent );
         
@@ -582,7 +582,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( LdapDN dn, LdapDN newParent, boolean ignoreReferral ) throws Exception
+    public void move( DN dn, DN newParent, boolean ignoreReferral ) throws Exception
     {
         move( dn, newParent, ignoreReferral, LogChange.TRUE );
     }
@@ -591,7 +591,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void move( LdapDN dn, LdapDN newParent, boolean ignoreReferral, LogChange log ) throws Exception
+    public void move( DN dn, DN newParent, boolean ignoreReferral, LogChange log ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         MoveOperationContext opContext = new MoveOperationContext( this, dn, newParent );
@@ -606,7 +606,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         moveAndRename( dn, newParent, newRdn, deleteOldRdn, LogChange.TRUE );
     }
@@ -615,7 +615,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
     {
         MoveAndRenameOperationContext opContext = 
             new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -630,7 +630,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
     {
         moveAndRename( dn, newParent, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
     }
@@ -639,7 +639,7 @@
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         MoveAndRenameOperationContext opContext = new MoveAndRenameOperationContext( this, dn, newParent, newRdn, deleteOldRdn );
@@ -654,7 +654,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         rename( dn, newRdn, deleteOldRdn, LogChange.TRUE );
     }
@@ -663,7 +663,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception
     {
         RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
         
@@ -678,7 +678,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception
     {
         rename( dn, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
     }
@@ -687,7 +687,7 @@
     /**
      * {@inheritDoc}
      */
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         RenameOperationContext opContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
@@ -702,7 +702,7 @@
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor search( LdapDN dn, String filter ) throws Exception
+    public EntryFilteringCursor search( DN dn, String filter ) throws Exception
     {
         return search( dn, filter, true );
     }
@@ -711,7 +711,7 @@
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor search( LdapDN dn, String filter, boolean ignoreReferrals ) throws Exception
+    public EntryFilteringCursor search( DN dn, String filter, boolean ignoreReferrals ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
         ExprNode filterNode = FilterParser.parse( filter ); 
@@ -731,9 +731,9 @@
     
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set)
+     * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set)
      */
-    public EntryFilteringCursor search( LdapDN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes ) throws Exception
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -743,9 +743,9 @@
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.LdapDN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
+     * @see org.apache.directory.server.core.CoreSession#search(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.filter.SearchScope, org.apache.directory.shared.ldap.filter.ExprNode, org.apache.directory.shared.ldap.message.AliasDerefMode, java.util.Set, int, int)
      */
-    public EntryFilteringCursor search( LdapDN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception
     {
         SearchOperationContext opContext = new SearchOperationContext( this, dn, scope, filter, 
@@ -800,7 +800,7 @@
     }
 
 
-    public boolean exists( LdapDN dn ) throws Exception
+    public boolean exists( DN dn ) throws Exception
     {
         EntryOperationContext opContext = new EntryOperationContext( this, dn );
         OperationManager operationManager = directoryService.getOperationManager();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Wed Mar  3 23:25:11 2010
@@ -89,7 +89,7 @@
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -141,7 +141,7 @@
     private OperationManager operationManager = new DefaultOperationManager( this );
 
     /** the distinguished name of the administrative user */
-    private LdapDN adminDn;
+    private DN adminDn;
     
     /** session used as admin for internal operations */
     private CoreSession adminSession;
@@ -660,7 +660,7 @@
     }
     
     
-    public CoreSession getSession( LdapDN principalDn, byte[] credentials ) 
+    public CoreSession getSession( DN principalDn, byte[] credentials ) 
         throws Exception
     {
         if ( ! started )
@@ -677,7 +677,7 @@
     }
     
     
-    public CoreSession getSession( LdapDN principalDn, byte[] credentials, String saslMechanism, String saslAuthId ) 
+    public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId ) 
         throws Exception
     {
         if ( ! started )
@@ -724,7 +724,7 @@
     /**
      * We handle the ModDN/ModRDN operation for the revert here. 
      */
-    private void moddn( LdapDN oldDn, LdapDN newDn, boolean delOldRdn ) throws Exception
+    private void moddn( DN oldDn, DN newDn, boolean delOldRdn ) throws Exception
     {
         if ( oldDn.size() == 0 )
         {
@@ -732,9 +732,9 @@
         }
 
         // calculate parents
-        LdapDN oldBase = ( LdapDN ) oldDn.clone();
+        DN oldBase = ( DN ) oldDn.clone();
         oldBase.remove( oldDn.size() - 1 );
-        LdapDN newBase = ( LdapDN ) newDn.clone();
+        DN newBase = ( DN ) newDn.clone();
         newBase.remove( newDn.size() - 1 );
 
         // Compute the RDN for each of the DN
@@ -755,7 +755,7 @@
         }
         else
         {
-            LdapDN target = ( LdapDN ) newDn.clone();
+            DN target = ( DN ) newDn.clone();
             target.remove( newDn.size() - 1 );
 
             if ( newRdn.equals( oldRdn ) )
@@ -837,8 +837,8 @@
                             // NO BREAK - both ModDN and ModRDN handling is the same
                         
                         case ChangeType.MODRDN_ORDINAL :
-                            LdapDN forwardDn = event.getForwardLdif().getDn();
-                            LdapDN reverseDn = reverse.getDn();
+                            DN forwardDn = event.getForwardLdif().getDn();
+                            DN reverseDn = reverse.getDn();
                             
                             moddn( reverseDn, forwardDn, reverse.isDeleteOldRdn() );
     
@@ -1067,7 +1067,7 @@
     }
 
 
-    public ServerEntry newEntry( LdapDN dn ) 
+    public ServerEntry newEntry( DN dn ) 
     {
         return new DefaultServerEntry( schemaManager, dn );
     }
@@ -1124,7 +1124,7 @@
         // -------------------------------------------------------------------
 
         Map<String,OidNormalizer> oidsMap = schemaManager.getNormalizerMapping();
-        LdapDN userDn = new LdapDN( ServerDNConstants.USERS_SYSTEM_DN );
+        DN userDn = new DN( ServerDNConstants.USERS_SYSTEM_DN );
         userDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, userDn ) ) )
@@ -1150,7 +1150,7 @@
         // create system groups area
         // -------------------------------------------------------------------
 
-        LdapDN groupDn = new LdapDN( ServerDNConstants.GROUPS_SYSTEM_DN );
+        DN groupDn = new DN( ServerDNConstants.GROUPS_SYSTEM_DN );
         groupDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, groupDn ) ) )
@@ -1176,7 +1176,7 @@
         // create administrator group
         // -------------------------------------------------------------------
 
-        LdapDN name = new LdapDN( ServerDNConstants.ADMINISTRATORS_GROUP_DN );
+        DN name = new DN( ServerDNConstants.ADMINISTRATORS_GROUP_DN );
         name.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, name ) ) )
@@ -1226,7 +1226,7 @@
         // create system configuration area
         // -------------------------------------------------------------------
 
-        LdapDN configurationDn = new LdapDN( "ou=configuration,ou=system" );
+        DN configurationDn = new DN( "ou=configuration,ou=system" );
         configurationDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, configurationDn ) ) )
@@ -1249,7 +1249,7 @@
         // create system configuration area for partition information
         // -------------------------------------------------------------------
 
-        LdapDN partitionsDn = new LdapDN( "ou=partitions,ou=configuration,ou=system" );
+        DN partitionsDn = new DN( "ou=partitions,ou=configuration,ou=system" );
         partitionsDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, partitionsDn ) ) )
@@ -1271,7 +1271,7 @@
         // create system configuration area for services
         // -------------------------------------------------------------------
 
-        LdapDN servicesDn = new LdapDN( "ou=services,ou=configuration,ou=system" );
+        DN servicesDn = new DN( "ou=services,ou=configuration,ou=system" );
         servicesDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, servicesDn ) ) )
@@ -1294,7 +1294,7 @@
         // create system configuration area for interceptors
         // -------------------------------------------------------------------
 
-        LdapDN interceptorsDn = new LdapDN( "ou=interceptors,ou=configuration,ou=system" );
+        DN interceptorsDn = new DN( "ou=interceptors,ou=configuration,ou=system" );
         interceptorsDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, interceptorsDn ) ) )
@@ -1317,7 +1317,7 @@
         // create system preferences area
         // -------------------------------------------------------------------
 
-        LdapDN sysPrefRootDn = new LdapDN( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
+        DN sysPrefRootDn = new DN( ServerDNConstants.SYSPREFROOT_SYSTEM_DN );
         sysPrefRootDn.normalize( oidsMap );
         
         if ( !partitionNexus.hasEntry( new EntryOperationContext( adminSession, sysPrefRootDn ) ) )
@@ -1352,7 +1352,7 @@
         // Warn if the default password is not changed.
         boolean needToChangeAdminPassword = false;
 
-        LdapDN adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN );
+        DN adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
         adminDn.normalize( schemaManager.getNormalizerMapping() );
         
         ServerEntry adminEntry = partitionNexus.lookup( new LookupOperationContext( adminSession, adminDn ) );
@@ -1427,12 +1427,12 @@
         partitions.add( schemaService.getSchemaPartition() );
         systemPartition.getSuffixDn().normalize( schemaManager.getNormalizerMapping() );
 
-        adminDn = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN ).normalize( schemaManager.getNormalizerMapping() );
+        adminDn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN ).normalize( schemaManager.getNormalizerMapping() );
         adminDn.normalize( schemaManager.getNormalizerMapping() );
         adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn, AuthenticationLevel.STRONG ), this );
         
         // @TODO - NOTE: Need to find a way to instantiate without dependency on DPN
-        partitionNexus = new DefaultPartitionNexus( new DefaultServerEntry( schemaManager, LdapDN.EMPTY_LDAPDN ) );
+        partitionNexus = new DefaultPartitionNexus( new DefaultServerEntry( schemaManager, DN.EMPTY_DN ) );
         partitionNexus.setDirectoryService( this );
         partitionNexus.initialize( );
         //partitionNexus.addContextPartition( new AddContextPartitionOperationContext( adminSession, schemaService.getSchemaPartition() ) );
@@ -1555,9 +1555,9 @@
         try
         {
             Entry entry = readEntry( ldif );
-            LdapDN ldapDn = new LdapDN( dn );
+            DN newDn = new DN( dn );
             
-            entry.setDn( ldapDn );
+            entry.setDn( newDn );
             
             // TODO Let's get rid of this Attributes crap
             ServerEntry serverEntry = new DefaultServerEntry( schemaManager, entry );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java Wed Mar  3 23:25:11 2010
@@ -61,7 +61,7 @@
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,7 +91,7 @@
     }
     
     
-    private LdapReferralException buildReferralException( ServerEntry parentEntry, LdapDN childDn ) 
+    private LdapReferralException buildReferralException( ServerEntry parentEntry, DN childDn ) 
         throws NamingException, LdapURLEncodingException
     {
         // Get the Ref attributeType
@@ -110,7 +110,7 @@
             // So we have to take the RDN one by one, and create a 
             // new DN with the type and value UP form
             
-            LdapDN urlDn = (LdapDN)ldapUrl.getDn().addAll( childDn );
+            DN urlDn = (DN)ldapUrl.getDn().addAll( childDn );
             
             ldapUrl.setDn( urlDn );
             urls.add( ldapUrl.toString() );
@@ -127,7 +127,7 @@
     
     
     private LdapReferralException buildReferralExceptionForSearch( 
-        ServerEntry parentEntry, LdapDN childDn, SearchScope scope ) 
+        ServerEntry parentEntry, DN childDn, SearchScope scope ) 
         throws NamingException, LdapURLEncodingException
     {
         // Get the Ref attributeType
@@ -145,7 +145,7 @@
                 
                 StringBuilder urlString = new StringBuilder();
     
-                if ( ( ldapUrl.getDn() == null ) || ( ldapUrl.getDn() == LdapDN.EMPTY_LDAPDN) )
+                if ( ( ldapUrl.getDn() == null ) || ( ldapUrl.getDn() == DN.EMPTY_DN) )
                 {
                     ldapUrl.setDn( parentEntry.getDn() );
                 }
@@ -156,7 +156,7 @@
                     // So we have to take the RDN one by one, and create a 
                     // new DN with the type and value UP form
                     
-                    LdapDN urlDn = (LdapDN)ldapUrl.getDn().addAll( childDn );
+                    DN urlDn = (DN)ldapUrl.getDn().addAll( childDn );
                     
                     ldapUrl.setDn( urlDn );
                 }
@@ -197,12 +197,12 @@
     }
 
 
-    private PartialResultException buildPartialResultException( LdapDN childDn )
+    private PartialResultException buildPartialResultException( DN childDn )
     {
         PartialResultException pre = new PartialResultException( I18n.err( I18n.ERR_315 ) );
         
         pre.setRemainingName( childDn );
-        pre.setResolvedName( LdapDN.EMPTY_LDAPDN );
+        pre.setResolvedName( DN.EMPTY_DN );
         
         return pre;
     }
@@ -222,7 +222,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -231,7 +231,7 @@
             if ( directoryService.getReferralManager().hasParentReferral( dn ) )
             {
                 ServerEntry parentEntry = directoryService.getReferralManager().getParentReferral( dn );
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
 
                 // Depending on the Context.REFERRAL property value, we will throw
                 // a different exception.
@@ -307,7 +307,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -319,7 +319,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -387,7 +387,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -398,7 +398,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -458,7 +458,7 @@
     /**
      * {@inheritDoc}
      */
-    public LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
     {
         LOG.debug( ">> GetMatchedNameOperation : {}", opContext );
         
@@ -505,7 +505,7 @@
     /**
      * {@inheritDoc}
      */
-    public LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
     {
         LOG.debug( ">> GetSuffixOperation : {}", opContext );
         
@@ -632,7 +632,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -644,7 +644,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -715,7 +715,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -727,7 +727,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -769,7 +769,7 @@
             
             // Now, check the destination
             // Normalize the opContext DN
-            LdapDN parentDn = opContext.getParent();
+            DN parentDn = opContext.getParent();
             parentDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // If he parent DN is a referral, or has a referral ancestor, we have to issue a AffectMultipleDsas result
@@ -817,7 +817,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -829,7 +829,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -871,7 +871,7 @@
             
             // Now, check the destination
             // Normalize the opContext DN
-            LdapDN parentDn = opContext.getParent();
+            DN parentDn = opContext.getParent();
             parentDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // If he parent DN is a referral, or has a referral ancestor, we have to issue a AffectMultipleDsas result
@@ -921,14 +921,14 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // Inject the newDn into the operation context
             // Inject the new DN into the context
             if ( !dn.isEmpty() )
             {
-                LdapDN newDn = (LdapDN)dn.clone();
+                DN newDn = (DN)dn.clone();
                 newDn.remove( dn.size() - 1 );
                 newDn.add( opContext.getNewRdn() );
                 opContext.setNewDn( newDn );
@@ -943,7 +943,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {
@@ -1013,7 +1013,7 @@
         try
         {
             // Normalize the opContext DN
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             dn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
 
             // We have to deal with the referral first
@@ -1025,7 +1025,7 @@
             if ( parentEntry != null )
             {
                 // We have found a parent referral for the current DN 
-                LdapDN childDn = (LdapDN)dn.getSuffix( parentEntry.getDn().size() );
+                DN childDn = (DN)dn.getSuffix( parentEntry.getDn().size() );
     
                 if ( directoryService.getReferralManager().isReferral( dn ) )
                 {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Wed Mar  3 23:25:11 2010
@@ -35,7 +35,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.util.tree.DnBranchNode;
 
 
@@ -154,7 +154,7 @@
         for ( String suffix:suffixes )
         {
             // We will store each entry's DN into the Referral tree
-            LdapDN suffixDn = new LdapDN( suffix );
+            DN suffixDn = new DN( suffix );
             suffixDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
             EntryFilteringCursor cursor = nexus.search( new SearchOperationContext( adminSession, suffixDn, AliasDerefMode.DEREF_ALWAYS,
                 referralFilter, searchControl ) );
@@ -182,7 +182,7 @@
     /**
      * {@inheritDoc}
      */
-    public void remove( DirectoryService directoryService, LdapDN suffix ) throws Exception
+    public void remove( DirectoryService directoryService, DN suffix ) throws Exception
     {
         ExprNode referralFilter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
             new ClientStringValue( SchemaConstants.REFERRAL_OC ) );
@@ -215,7 +215,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean hasParentReferral( LdapDN dn )
+    public boolean hasParentReferral( DN dn )
     {
         return referrals.hasParentElement( dn );
     }
@@ -224,7 +224,7 @@
     /**
      * {@inheritDoc}
      */
-    public ServerEntry getParentReferral( LdapDN dn )
+    public ServerEntry getParentReferral( DN dn )
     {
         if ( !hasParentReferral( dn ) )
         {
@@ -238,7 +238,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean isReferral( LdapDN dn )
+    public boolean isReferral( DN dn )
     {
         ServerEntry parent = referrals.getParentElement( dn );
         

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java Wed Mar  3 23:25:11 2010
@@ -23,7 +23,7 @@
 import javax.naming.NamingException;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -117,7 +117,7 @@
     /**
      * Does nothing leaving it so subclasses can override.
      */
-    public void invalidateCache( LdapDN bindDn )
+    public void invalidateCache( DN bindDn )
     {
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Wed Mar  3 23:25:11 2010
@@ -59,7 +59,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -227,7 +227,7 @@
     }
 
 
-    public LdapDN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
     {
         if ( IS_DEBUG )
         {
@@ -251,7 +251,7 @@
     }
 
 
-    public LdapDN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
     {
         if ( IS_DEBUG )
         {
@@ -311,7 +311,7 @@
     }
 
     
-    private void invalidateAuthenticatorCaches( LdapDN principalDn )
+    private void invalidateAuthenticatorCaches( DN principalDn )
     {
         for ( String authMech : authenticatorsMapByType.keySet() )
         {
@@ -513,7 +513,7 @@
             LOG.info( "Cannot bind to the server " );
         }
 
-        LdapDN dn = opContext.getDn();
+        DN dn = opContext.getDn();
         String upDn = ( dn == null ? "" : dn.getName() );
         throw new LdapAuthenticationException( I18n.err( I18n.ERR_229, upDn ) );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java Wed Mar  3 23:25:11 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.server.core.LdapPrincipal;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.server.core.partition.DefaultPartitionNexus;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -36,7 +36,7 @@
  * {@link AuthenticationInterceptor} interceptor.
  * <p>
  * {@link AuthenticationInterceptor} authenticates users by calling
- * {@link #authenticate(LdapDN,ServerContext)}, and then {@link Authenticator}
+ * {@link #authenticate(DN,ServerContext)}, and then {@link Authenticator}
  * checks JNDI {@link Context} environment properties
  * ({@link Context#SECURITY_PRINCIPAL} and {@link Context#SECURITY_CREDENTIALS})
  * of current {@link Context}.
@@ -76,7 +76,7 @@
      * 
      * @param bindDn the already normalized distinguished name of the bind principal
      */
-    void invalidateCache( LdapDN bindDn );
+    void invalidateCache( DN bindDn );
 
     
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Wed Mar  3 23:25:11 2010
@@ -55,7 +55,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
 import org.apache.directory.shared.ldap.util.Base64;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -610,7 +610,7 @@
 
             if ( userEntry == null )
             {
-                LdapDN dn = opContext.getDn();
+                DN dn = opContext.getDn();
                 String upDn = ( dn == null ? "" : dn.getName() );
 
                 throw new LdapAuthenticationException( I18n.err( I18n.ERR_231, upDn ) );
@@ -739,7 +739,7 @@
      * Remove the principal form the cache. This is used when the user changes
      * his password.
      */
-    public void invalidateCache( LdapDN bindDn )
+    public void invalidateCache( DN bindDn )
     {
         synchronized ( credentialCache )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Wed Mar  3 23:25:11 2010
@@ -74,7 +74,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 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.normalizers.ConcreteNameComponentNormalizer;
@@ -195,7 +195,7 @@
     {
         super.init( directoryService );
 
-        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 );
@@ -222,15 +222,15 @@
         Value<?> subschemaSubentry = 
             directoryService.getPartitionNexus().getRootDSE( null ).
                 get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
-        LdapDN subschemaSubentryDnName = new LdapDN( subschemaSubentry.getString() );
+        DN subschemaSubentryDnName = new DN( subschemaSubentry.getString() );
         subschemaSubentryDnName.normalize( schemaManager.getNormalizerMapping() );
         subschemaSubentryDn = subschemaSubentryDnName.toNormName();
     }
 
 
-    private void protectCriticalEntries( LdapDN dn ) throws Exception
+    private void protectCriticalEntries( DN dn ) throws Exception
     {
-        LdapDN principalDn = getPrincipal().getClonedName();
+        DN principalDn = getPrincipal().getClonedName();
 
         if ( dn.isEmpty() )
         {
@@ -262,7 +262,7 @@
      * @throws Exception if there are problems accessing attribute values
      * @param proxy the partition nexus proxy object
      */
-    private void addPerscriptiveAciTuples( OperationContext opContext, Collection<ACITuple> tuples, LdapDN dn,
+    private void addPerscriptiveAciTuples( OperationContext opContext, Collection<ACITuple> tuples, DN dn,
         ServerEntry entry ) throws Exception
     {
         EntryAttribute oc = null;
@@ -287,7 +287,7 @@
          */
         if ( oc.contains( SchemaConstants.SUBENTRY_OC ) || oc.contains( subentryOid ) )
         {
-            LdapDN parentDn = ( LdapDN ) dn.clone();
+            DN parentDn = ( DN ) dn.clone();
             parentDn.remove( dn.size() - 1 );
             entry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS );
         }
@@ -355,7 +355,7 @@
      * @throws Exception if there are problems accessing attribute values
      * @param proxy the partition nexus proxy object
      */
-    private void addSubentryAciTuples( OperationContext opContext, Collection<ACITuple> tuples, LdapDN dn, ServerEntry entry )
+    private void addSubentryAciTuples( OperationContext opContext, Collection<ACITuple> tuples, DN dn, ServerEntry entry )
         throws Exception
     {
         // only perform this for subentries
@@ -366,7 +366,7 @@
 
         // get the parent or administrative entry for this subentry since it
         // will contain the subentryACI attributes that effect subentries
-        LdapDN parentDn = ( LdapDN ) dn.clone();
+        DN parentDn = ( DN ) dn.clone();
         parentDn.remove( dn.size() - 1 );
         ServerEntry administrativeEntry = opContext.lookup( parentDn, ByPassConstants.LOOKUP_BYPASS ).getOriginalEntry();
         
@@ -423,12 +423,12 @@
     {
         // Access the principal requesting the operation, and bypass checks if it is the admin
         LdapPrincipal principal = addContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
         
         ServerEntry serverEntry = addContext.getEntry(); 
         //Attributes entry = ServerEntryUtils.toAttributesImpl( serverEntry );
 
-        LdapDN name = addContext.getDn();
+        DN name = addContext.getDn();
 
         // bypass authz code if we are disabled
         if ( !addContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -456,7 +456,7 @@
         }
 
         // Assemble all the information required to make an access control decision
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toNormName() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
 
         // Build the total collection of tuples to be considered for add rights
@@ -489,7 +489,7 @@
     }
 
 
-    private boolean isTheAdministrator( LdapDN normalizedDn )
+    private boolean isTheAdministrator( DN normalizedDn )
     {
         return normalizedDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
     }
@@ -497,10 +497,10 @@
 
     public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws Exception
     {
-        LdapDN name = deleteContext.getDn();
+        DN name = deleteContext.getDn();
         
         LdapPrincipal principal = deleteContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
 
         // bypass authz code if we are disabled
         if ( ! deleteContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -522,7 +522,7 @@
             return;
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( deleteContext, tuples, name, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );
@@ -539,13 +539,13 @@
 
     public void modify( NextInterceptor next, ModifyOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
 
         // Access the principal requesting the operation, and bypass checks if it is the admin
         ClonedServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
         
         LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
 
         // bypass authz code if we are disabled
         if ( !opContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -569,7 +569,7 @@
             return;
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( opContext, tuples, name, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );
@@ -661,7 +661,7 @@
     
     public boolean hasEntry( NextInterceptor next, EntryOperationContext entryContext ) throws Exception
     {
-        LdapDN name = entryContext.getDn();
+        DN name = entryContext.getDn();
         
         if ( ! entryContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
@@ -680,14 +680,14 @@
         
         // TODO - eventually replace this with a check on session.isAnAdministrator()
         LdapPrincipal principal = entryContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
         if ( isPrincipalAnAdministrator( principalDn ) )
         {
             return answer;
         }
 
         ClonedServerEntry entry = entryContext.lookup( name, ByPassConstants.HAS_ENTRY_BYPASS );
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toNormName() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( entryContext, tuples, name, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry.getOriginalEntry() );
@@ -726,8 +726,8 @@
         }
 
         LdapPrincipal principal = lookupContext.getSession().getEffectivePrincipal();
-        LdapDN userName = principal.getClonedName();
-        Set<LdapDN> userGroups = groupCache.getGroups( userName.toNormName() );
+        DN userName = principal.getClonedName();
+        Set<DN> userGroups = groupCache.getGroups( userName.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( lookupContext, tuples, lookupContext.getDn(), entry );
         addEntryAciTuples( tuples, entry );
@@ -765,7 +765,7 @@
     public ClonedServerEntry lookup( NextInterceptor next, LookupOperationContext lookupContext ) throws Exception
     {
         LdapPrincipal principal = lookupContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
         
         if ( !principalDn.isNormalized() )
         {
@@ -788,7 +788,7 @@
     
     public void rename( NextInterceptor next, RenameOperationContext renameContext ) throws Exception
     {
-        LdapDN oldName = renameContext.getDn();
+        DN oldName = renameContext.getDn();
         ServerEntry originalEntry = null;
         
         if ( renameContext.getEntry() != null )
@@ -797,8 +797,8 @@
         }
         
         LdapPrincipal principal = renameContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
-        LdapDN newName = renameContext.getNewDn();
+        DN principalDn = principal.getClonedName();
+        DN newName = renameContext.getNewDn();
 
         // bypass authz code if we are disabled
         if ( !renameContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -821,7 +821,7 @@
             return;
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( renameContext, tuples, oldName, originalEntry );
         addEntryAciTuples( tuples, originalEntry );
@@ -840,14 +840,14 @@
     public void moveAndRename( NextInterceptor next, MoveAndRenameOperationContext moveAndRenameContext )
         throws Exception
     {
-        LdapDN oriChildName = moveAndRenameContext.getDn();
-        LdapDN newParentName = moveAndRenameContext.getParent();
+        DN oriChildName = moveAndRenameContext.getDn();
+        DN newParentName = moveAndRenameContext.getParent();
 
         ClonedServerEntry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
         
         LdapPrincipal principal = moveAndRenameContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
-        LdapDN newName = ( LdapDN ) newParentName.clone();
+        DN principalDn = principal.getClonedName();
+        DN newName = ( DN ) newParentName.clone();
         newName.add( moveAndRenameContext.getNewRdn().getUpName() );
 
         // bypass authz code if we are disabled
@@ -868,7 +868,7 @@
             return;
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( moveAndRenameContext, tuples, oriChildName, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );
@@ -918,16 +918,16 @@
 
     public void move( NextInterceptor next, MoveOperationContext moveContext ) throws Exception
     {
-        LdapDN oriChildName = moveContext.getDn();
-        LdapDN newParentName = moveContext.getParent();
+        DN oriChildName = moveContext.getDn();
+        DN newParentName = moveContext.getParent();
         
         // Access the principal requesting the operation, and bypass checks if it is the admin
         ClonedServerEntry entry = moveContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
        
-        LdapDN newName = ( LdapDN ) newParentName.clone();
+        DN newName = ( DN ) newParentName.clone();
         newName.add( oriChildName.get( oriChildName.size() - 1 ) );
         LdapPrincipal principal = moveContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
 
         // bypass authz code if we are disabled
         if ( !moveContext.getSession().getDirectoryService().isAccessControlEnabled() )
@@ -947,7 +947,7 @@
             return;
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( moveContext, tuples, oriChildName, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );
@@ -1013,7 +1013,7 @@
     public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext opContext ) throws Exception
     {
         LdapPrincipal user = opContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = user.getClonedName();
+        DN principalDn = user.getClonedName();
         EntryFilteringCursor cursor = next.search( opContext );
 
         boolean isSubschemaSubentryLookup = subschemaSubentryDn.equals( opContext.getDn().getNormName() );
@@ -1030,7 +1030,7 @@
     }
 
     
-    public final boolean isPrincipalAnAdministrator( LdapDN principalDn )
+    public final boolean isPrincipalAnAdministrator( DN principalDn )
     {
         return groupCache.isPrincipalAnAdministrator( principalDn );
     }
@@ -1038,21 +1038,21 @@
 
     public boolean compare( NextInterceptor next, CompareOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
         String oid = opContext.getOid();
         Value<?> value = ( Value<?> ) opContext.getValue();
 
         ClonedServerEntry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
 
         LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
 
         if ( isPrincipalAnAdministrator( principalDn ) || !opContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
             return next.compare( opContext );
         }
 
-        Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toNormName() );
+        Set<DN> userGroups = groupCache.getGroups( principalDn.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( opContext, tuples, name, entry.getOriginalEntry() );
         addEntryAciTuples( tuples, entry );
@@ -1069,11 +1069,11 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
     {
         // Access the principal requesting the operation, and bypass checks if it is the admin
         LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
-        LdapDN principalDn = principal.getClonedName();
+        DN principalDn = principal.getClonedName();
         
         if ( isPrincipalAnAdministrator( principalDn ) || !opContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
@@ -1082,7 +1082,7 @@
 
         // get the present matched name
         ClonedServerEntry entry;
-        LdapDN matched = next.getMatchedName( opContext );
+        DN matched = next.getMatchedName( opContext );
 
         // check if we have disclose on error permission for the entry at the matched dn
         // if not remove rdn and check that until nothing is left in the name and return
@@ -1091,7 +1091,7 @@
         {
             entry = opContext.lookup( matched, ByPassConstants.GETMATCHEDDN_BYPASS );
             
-            Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toString() );
+            Set<DN> userGroups = groupCache.getGroups( principalDn.toString() );
             Collection<ACITuple> tuples = new HashSet<ACITuple>();
             addPerscriptiveAciTuples( opContext, tuples, matched, entry.getOriginalEntry() );
             addEntryAciTuples( tuples, entry );
@@ -1111,13 +1111,13 @@
     }
 
 
-    public void cacheNewGroup( LdapDN name, ServerEntry entry ) throws Exception
+    public void cacheNewGroup( DN name, ServerEntry entry ) throws Exception
     {
         groupCache.groupAdded( name, entry );
     }
 
 
-    private boolean filter( OperationContext opContext, LdapDN normName, ClonedServerEntry clonedEntry ) 
+    private boolean filter( OperationContext opContext, DN normName, ClonedServerEntry clonedEntry ) 
         throws Exception
     {
         /*
@@ -1127,8 +1127,8 @@
          */
         
         LdapPrincipal principal = opContext.getSession().getEffectivePrincipal();
-        LdapDN userDn = principal.getClonedName();
-        Set<LdapDN> userGroups = groupCache.getGroups( userDn.toNormName() );
+        DN userDn = principal.getClonedName();
+        Set<DN> userGroups = groupCache.getGroups( userDn.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
         addPerscriptiveAciTuples( opContext, tuples, normName, clonedEntry.getOriginalEntry() );
         addEntryAciTuples( tuples, clonedEntry.getOriginalEntry() );
@@ -1236,7 +1236,7 @@
         public boolean accept( SearchingOperationContext operationContext, ClonedServerEntry entry ) 
             throws Exception
         {
-            LdapDN normName = entry.getDn().normalize( schemaManager.getNormalizerMapping() );
+            DN normName = entry.getDn().normalize( schemaManager.getNormalizerMapping() );
             return filter( operationContext, normName, entry );
         }
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java Wed Mar  3 23:25:11 2010
@@ -55,7 +55,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.slf4j.Logger;
@@ -81,17 +81,17 @@
     /**
      * the base distinguished {@link Name} for all users
      */
-    private static LdapDN USER_BASE_DN;
+    private static DN USER_BASE_DN;
 
     /**
      * the base distinguished {@link Name} for all groups
      */
-    private static LdapDN GROUP_BASE_DN;
+    private static DN GROUP_BASE_DN;
 
     /**
      * the distinguished {@link Name} for the administrator group
      */
-    private static LdapDN ADMIN_GROUP_DN;
+    private static DN ADMIN_GROUP_DN;
 
     private Set<String> administrators = new HashSet<String>(2);
     
@@ -115,13 +115,13 @@
         nexus = directoryService.getPartitionNexus();
         SchemaManager schemaManager = directoryService.getSchemaManager();
 
-        USER_BASE_DN = new LdapDN( ServerDNConstants.ADMIN_SYSTEM_DN );
+        USER_BASE_DN = new DN( ServerDNConstants.ADMIN_SYSTEM_DN );
         USER_BASE_DN.normalize( schemaManager.getNormalizerMapping() );
         
-        GROUP_BASE_DN = new LdapDN( ServerDNConstants.GROUPS_SYSTEM_DN );
+        GROUP_BASE_DN = new DN( ServerDNConstants.GROUPS_SYSTEM_DN );
         GROUP_BASE_DN.normalize( schemaManager.getNormalizerMapping() );
      
-        ADMIN_GROUP_DN = new LdapDN( ServerDNConstants.ADMINISTRATORS_GROUP_DN );
+        ADMIN_GROUP_DN = new DN( ServerDNConstants.ADMINISTRATORS_GROUP_DN );
         ADMIN_GROUP_DN.normalize( schemaManager.getNormalizerMapping() );
 
         uniqueMemberAT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.UNIQUE_MEMBER_AT_OID );
@@ -134,7 +134,7 @@
     {
         // read in the administrators and cache their normalized names
         Set<String> newAdministrators = new HashSet<String>( 2 );
-        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 );
@@ -150,7 +150,7 @@
         
         for ( Value<?> value:uniqueMember )
         {
-            LdapDN memberDn = new LdapDN( value.getString() );
+            DN memberDn = new DN( value.getString() );
             memberDn.normalize( directoryService.getSchemaManager().getNormalizerMapping() );
             newAdministrators.add( memberDn.getNormName() );
         }
@@ -165,7 +165,7 @@
 
     public void delete( NextInterceptor nextInterceptor, DeleteOperationContext opContext ) throws Exception
     {
-        LdapDN name = opContext.getDn();
+        DN name = opContext.getDn();
         
         if ( opContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
@@ -173,7 +173,7 @@
             return;
         }
 
-        LdapDN principalDn = getPrincipal().getClonedName();
+        DN principalDn = getPrincipal().getClonedName();
 
         if ( name.isEmpty() )
         {
@@ -220,13 +220,13 @@
     }
 
     
-    private boolean isTheAdministrator( LdapDN normalizedDn )
+    private boolean isTheAdministrator( DN normalizedDn )
     {
         return normalizedDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
     }
     
     
-    private boolean isAnAdministrator( LdapDN normalizedDn )
+    private boolean isAnAdministrator( DN normalizedDn )
     {
         return isTheAdministrator( normalizedDn ) || administrators.contains( normalizedDn.getNormName() );
 
@@ -248,7 +248,7 @@
     {
         if ( !opContext.getSession().getDirectoryService().isAccessControlEnabled() )
         {
-            LdapDN dn = opContext.getDn();
+            DN dn = opContext.getDn();
             
             protectModifyAlterations( dn );
             nextInterceptor.modify( opContext );
@@ -266,9 +266,9 @@
     }
 
 
-    private void protectModifyAlterations( LdapDN dn ) throws Exception
+    private void protectModifyAlterations( DN dn ) throws Exception
     {
-        LdapDN principalDn = getPrincipal().getClonedName();
+        DN principalDn = getPrincipal().getClonedName();
 
         if ( dn.isEmpty() )
         {
@@ -355,9 +355,9 @@
     }
 
 
-    private void protectDnAlterations( LdapDN dn ) throws Exception
+    private void protectDnAlterations( DN dn ) throws Exception
     {
-        LdapDN principalDn = getPrincipal().getClonedName();
+        DN principalDn = getPrincipal().getClonedName();
 
         if ( dn.isEmpty() )
         {
@@ -410,7 +410,7 @@
     }
 
 
-    private void protectLookUp( LdapDN principalDn, LdapDN normalizedDn ) throws Exception
+    private void protectLookUp( DN principalDn, DN normalizedDn ) throws Exception
     {
         if ( !isAnAdministrator( principalDn ) )
         {
@@ -500,8 +500,8 @@
 
     private boolean isSearchable( OperationContext opContext, ClonedServerEntry result ) throws Exception
     {
-        LdapDN principalDn = opContext.getSession().getEffectivePrincipal().getClonedName();
-        LdapDN dn = result.getDn();
+        DN principalDn = opContext.getSession().getEffectivePrincipal().getClonedName();
+        DN dn = result.getDn();
         
         if ( !dn.isNormalized() )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Wed Mar  3 23:25:11 2010
@@ -47,7 +47,7 @@
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.OrNode;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
@@ -87,9 +87,9 @@
     private Map<String, OidNormalizer> normalizerMap;
 
     /** the normalized dn of the administrators group */
-    private LdapDN administratorsGroupDn;
+    private DN administratorsGroupDn;
 
-    private static final Set<LdapDN> EMPTY_GROUPS = new HashSet<LdapDN>();
+    private static final Set<DN> EMPTY_GROUPS = new HashSet<DN>();
 
 
     /**
@@ -113,9 +113,9 @@
     }
 
 
-    private LdapDN parseNormalized( String name ) throws NamingException
+    private DN parseNormalized( String name ) throws NamingException
     {
-        LdapDN dn = new LdapDN( name );
+        DN dn = new DN( name );
         dn.normalize( normalizerMap );
         return dn;
     }
@@ -136,7 +136,7 @@
 
         for ( String suffix:suffixes )
         {
-            LdapDN baseDn = new LdapDN( suffix ).normalize( normalizerMap );
+            DN baseDn = new DN( suffix ).normalize( normalizerMap );
             SearchControls ctls = new SearchControls();
             ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
             
@@ -147,7 +147,7 @@
             while ( results.next() )
             {
                 ServerEntry result = results.get();
-                LdapDN groupDn = result.getDn().normalize( normalizerMap );
+                DN groupDn = result.getDn().normalize( normalizerMap );
                 EntryAttribute members = getMemberAttribute( result );
 
                 if ( members != null )
@@ -282,7 +282,7 @@
      * @param entry the group entry's attributes
      * @throws NamingException if there are problems accessing the attr values
      */
-    public void groupAdded( LdapDN name, ServerEntry entry ) throws NamingException
+    public void groupAdded( DN name, ServerEntry entry ) throws NamingException
     {
         EntryAttribute members = getMemberAttribute( entry );
 
@@ -309,7 +309,7 @@
      * @param name the normalized DN of the group entry
      * @param entry the attributes of entry being deleted
      */
-    public void groupDeleted( LdapDN name, ServerEntry entry ) throws NamingException
+    public void groupDeleted( DN name, ServerEntry entry ) throws NamingException
     {
         EntryAttribute members = getMemberAttribute( entry );
 
@@ -374,7 +374,7 @@
      * @param entry the group entry being modified
      * @throws NamingException if there are problems accessing attribute  values
      */
-    public void groupModified( LdapDN name, List<Modification> mods, ServerEntry entry, SchemaManager schemaManager )
+    public void groupModified( DN name, List<Modification> mods, ServerEntry entry, SchemaManager schemaManager )
         throws NamingException
     {
         EntryAttribute members = null;
@@ -429,7 +429,7 @@
      * @param mods the modifications being performed
      * @throws NamingException if there are problems accessing attribute  values
      */
-    public void groupModified( LdapDN name, ModificationOperation modOp, ServerEntry mods ) throws NamingException
+    public void groupModified( DN name, ModificationOperation modOp, ServerEntry mods ) throws NamingException
     {
         EntryAttribute members = getMemberAttribute( mods );
 
@@ -459,7 +459,7 @@
      * @param principalDn the normalized DN of the user to check if they are an admin
      * @return true if the principal is an admin or the admin
      */
-    public final boolean isPrincipalAnAdministrator( LdapDN principalDn )
+    public final boolean isPrincipalAnAdministrator( DN principalDn )
     {
         if ( principalDn.getNormName().equals( ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED ) )
         {
@@ -486,9 +486,9 @@
      * @return a Set of Name objects representing the groups
      * @throws NamingException if there are problems accessing attribute  values
      */
-    public Set<LdapDN> getGroups( String member ) throws NamingException
+    public Set<DN> getGroups( String member ) throws NamingException
     {
-        LdapDN normMember;
+        DN normMember;
 
         try
         {
@@ -503,7 +503,7 @@
             return EMPTY_GROUPS;
         }
 
-        Set<LdapDN> memberGroups = null;
+        Set<DN> memberGroups = null;
 
         for ( String group : groups.keySet() )
         {
@@ -518,7 +518,7 @@
             {
                 if ( memberGroups == null )
                 {
-                    memberGroups = new HashSet<LdapDN>();
+                    memberGroups = new HashSet<DN>();
                 }
 
                 memberGroups.add( parseNormalized( group ) );
@@ -534,7 +534,7 @@
     }
 
 
-    public boolean groupRenamed( LdapDN oldName, LdapDN newName )
+    public boolean groupRenamed( DN oldName, DN newName )
     {
         Set<String> members = groups.remove( oldName.getNormName() );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Wed Mar  3 23:25:11 2010
@@ -51,7 +51,7 @@
 import org.apache.directory.shared.ldap.filter.ExprNode;
 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.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -103,9 +103,9 @@
     }
 
 
-    private LdapDN parseNormalized( SchemaManager schemaManager, String name ) throws NamingException
+    private DN parseNormalized( SchemaManager schemaManager, String name ) throws NamingException
     {
-        LdapDN dn = new LdapDN( name );
+        DN dn = new DN( name );
         dn.normalize( schemaManager.getNormalizerMapping() );
         return dn;
     }
@@ -120,7 +120,7 @@
 
         for ( String suffix:suffixes )
         {
-            LdapDN baseDn = parseNormalized( session.getDirectoryService().getSchemaManager(), suffix );
+            DN baseDn = parseNormalized( session.getDirectoryService().getSchemaManager(), suffix );
             ExprNode filter = new EqualityNode<String>( SchemaConstants.OBJECT_CLASS_AT, 
                 new ClientStringValue( SchemaConstants.ACCESS_CONTROL_SUBENTRY_OC ) );
             SearchControls ctls = new SearchControls();
@@ -131,7 +131,7 @@
             while ( results.next() )
             {
                 ServerEntry result = results.get();
-                LdapDN subentryDn = result.getDn().normalize( session.getDirectoryService().getSchemaManager().
+                DN subentryDn = result.getDn().normalize( session.getDirectoryService().getSchemaManager().
                         getNormalizerMapping() );
                 EntryAttribute aci = result.get( prescriptiveAciAT );
 
@@ -175,7 +175,7 @@
     }
 
 
-    public void subentryAdded( LdapDN normName, ServerEntry entry ) throws NamingException
+    public void subentryAdded( DN normName, ServerEntry entry ) throws NamingException
     {
         // only do something if the entry contains prescriptiveACI
         EntryAttribute aciAttr = entry.get( prescriptiveAciAT );
@@ -211,7 +211,7 @@
     }
 
 
-    public void subentryDeleted( LdapDN normName, ServerEntry entry ) throws NamingException
+    public void subentryDeleted( DN normName, ServerEntry entry ) throws NamingException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {
@@ -222,7 +222,7 @@
     }
 
 
-    public void subentryModified( LdapDN normName, List<Modification> mods, ServerEntry entry ) throws NamingException
+    public void subentryModified( DN normName, List<Modification> mods, ServerEntry entry ) throws NamingException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {
@@ -240,7 +240,7 @@
     }
 
 
-    public void subentryModified( LdapDN normName, ServerEntry mods, ServerEntry entry ) throws NamingException
+    public void subentryModified( DN normName, ServerEntry mods, ServerEntry entry ) throws NamingException
     {
         if ( !hasPrescriptiveACI( entry ) )
         {
@@ -267,7 +267,7 @@
     }
 
 
-    public void subentryRenamed( LdapDN oldName, LdapDN newName )
+    public void subentryRenamed( DN oldName, DN newName )
     {
         tuples.put( newName.toString(), tuples.remove( oldName.toString() ) );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Wed Mar  3 23:25:11 2010
@@ -48,7 +48,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-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;
 
@@ -129,10 +129,10 @@
     public void checkPermission( 
         SchemaManager schemaManager, 
         OperationContext opContext, 
-        Collection<LdapDN> userGroupNames, 
-        LdapDN username,
+        Collection<DN> userGroupNames, 
+        DN username,
         AuthenticationLevel authenticationLevel, 
-        LdapDN entryName, 
+        DN entryName, 
         String attrId, 
         Value<?> attrValue, 
         Collection<MicroOperation> microOperations, 
@@ -187,10 +187,10 @@
     public boolean hasPermission( 
         SchemaManager schemaManager, 
         OperationContext opContext, 
-        Collection<LdapDN> userGroupNames, 
-        LdapDN userName,
+        Collection<DN> userGroupNames, 
+        DN userName,
         AuthenticationLevel authenticationLevel, 
-        LdapDN entryName, 
+        DN entryName, 
         String attrId, 
         Value<?> attrValue, 
         Collection<MicroOperation> microOperations, 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Wed Mar  3 23:25:11 2010
@@ -30,7 +30,7 @@
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -51,11 +51,11 @@
      * @param tuples the collection of tuples to filter
      * @param scope the scope of the operation to be performed
      * @param proxy the proxy interceptor for this filter to access the DIT
-     * @param userGroupNames the collection of group ({@link LdapDN})s which the current user belongs to
-     * @param userName the {@link LdapDN} of the current user
+     * @param userGroupNames the collection of group ({@link DN})s which the current user belongs to
+     * @param userName the {@link DN} of the current user
      * @param userEntry the {@link ServerEntry} of the current user entry in the DIT
      * @param authenticationLevel the level of authentication of the current user
-     * @param entryName the {@link LdapDN} of the entry the current user accesses
+     * @param entryName the {@link DN} of the entry the current user accesses
      * @param attrId the attribute ID the current user accesses
      * @param attrValue the value of the attribute the current user accesses
      * @param entry the {@link ServerEntry} of the entry the current user accesses
@@ -69,11 +69,11 @@
             Collection<ACITuple> tuples, 
             OperationScope scope, 
             OperationContext opContext,
-            Collection<LdapDN> userGroupNames, 
-            LdapDN userName, 
+            Collection<DN> userGroupNames, 
+            DN userName, 
             ServerEntry userEntry,
             AuthenticationLevel authenticationLevel, 
-            LdapDN entryName, 
+            DN entryName, 
             String attrId,
             Value<?> attrValue, 
             ServerEntry entry, 



Mime
View raw message