directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918766 [1/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
Author: elecharny
Date: Wed Mar  3 23:25:11 2010
New Revision: 918766

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

Modified:
    directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
    directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetRootDSEOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetSuffixOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ListSuffixOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/LookupOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RemoveContextPartitionOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchingOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/NullPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/Partition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDaoImpl.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxSynchronizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AbstractAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/Authenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributesSchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/ScopeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/PreferencesUtils.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/prefs/ServerSystemPreferences.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/replication/SimpleReplicaConnection.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaChecker.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/LdapClassLoader.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/sp/StoredProcExecutionManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubtreeEvaluator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/InterceptorChainTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/interceptor/MockInterceptor.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java

Modified: directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlStore.java Wed Mar  3 23:25:11 2010
@@ -54,7 +54,7 @@
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -135,10 +135,10 @@
      * TODO we need to check out why we have so many suffix 
      * dn and string accessor/mutators on both Store and Partition
      * interfaces.  I think a lot of this comes from the fact 
-     * that we implemented LdapDN to have both the up and norm
+     * that we implemented DN to have both the up and norm
      * names.
      */
-    private LdapDN suffixDn;
+    private DN suffixDn;
 
     private String name;
 
@@ -153,7 +153,7 @@
             throw new Exception( I18n.err( I18n.ERR_215 ) );
         }
 
-        LdapDN normName = entry.getDn();
+        DN normName = entry.getDn();
 
         Long id;
         Long parentId;
@@ -166,7 +166,7 @@
         // entry sequences start at 1.
         //
 
-        LdapDN parentDn = null;
+        DN parentDn = null;
 
         if ( normName.getNormName().equals( suffixDn.getNormName() ) )
         {
@@ -174,7 +174,7 @@
         }
         else
         {
-            parentDn = ( LdapDN ) normName.clone();
+            parentDn = ( DN ) normName.clone();
             parentDn.remove( parentDn.size() - 1 );
             parentId = getEntryId( parentDn.getNormName() );
         }
@@ -518,7 +518,7 @@
     /**
      * {@inheritDoc}
      */
-    public LdapDN getSuffix()
+    public DN getSuffix()
     {
         if ( suffixDn == null )
         {
@@ -527,7 +527,7 @@
 
         try
         {
-            return new LdapDN( suffixDn.getNormName() );
+            return new DN( suffixDn.getNormName() );
         }
         catch ( InvalidNameException e )
         {
@@ -542,7 +542,7 @@
     /**
      * {@inheritDoc}
      */
-    public LdapDN getUpSuffix()
+    public DN getUpSuffix()
     {
         if ( suffixDn == null )
         {
@@ -551,7 +551,7 @@
 
         try
         {
-            return new LdapDN( suffixDn.getName() );
+            return new DN( suffixDn.getName() );
         }
         catch ( InvalidNameException e )
         {
@@ -874,7 +874,7 @@
      * which affects alias userIndices.
      * @throws NamingException if something goes wrong
      */
-    private void modifyDn( Long id, LdapDN updn, boolean isMove ) throws Exception
+    private void modifyDn( Long id, DN updn, boolean isMove ) throws Exception
     {
         String aliasTarget;
 
@@ -906,7 +906,7 @@
 
             if ( null != aliasTarget )
             {
-                addAliasIndices( id, new LdapDN( getEntryDn( id ) ), aliasTarget );
+                addAliasIndices( id, new DN( getEntryDn( id ) ), aliasTarget );
             }
         }
 
@@ -921,11 +921,11 @@
              * Calculate the DN for the child's new name by copying the parents
              * new name and adding the child's old upRdn to new name as its RDN
              */
-            LdapDN childUpdn = ( LdapDN ) updn.clone();
-            LdapDN oldUpdn = new LdapDN( getEntryUpdn( childId ) );
+            DN childUpdn = ( DN ) updn.clone();
+            DN oldUpdn = new DN( getEntryUpdn( childId ) );
 
             String rdn = oldUpdn.get( oldUpdn.size() - 1 );
-            LdapDN rdnDN = new LdapDN( rdn );
+            DN rdnDN = new DN( rdn );
             rdnDN.normalize( schemaManager.getNormalizerMapping() );
             childUpdn.add( rdnDN.getRdn() );
 
@@ -997,7 +997,7 @@
         if ( modsOid.equals( SchemaConstants.ALIASED_OBJECT_NAME_AT_OID ) )
         {
             String ndnStr = ndnIdx.reverseLookup( id );
-            addAliasIndices( id, new LdapDN( ndnStr ), mods.getString() );
+            addAliasIndices( id, new DN( ndnStr ), mods.getString() );
         }
     }
 
@@ -1177,12 +1177,12 @@
         if ( modsOid.equals( aliasAttributeOid ) && mods.size() > 0 )
         {
             String ndnStr = ndnIdx.reverseLookup( id );
-            addAliasIndices( id, new LdapDN( ndnStr ), mods.getString() );
+            addAliasIndices( id, new DN( ndnStr ), mods.getString() );
         }
     }
 
 
-    public void modify( LdapDN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
+    public void modify( DN dn, ModificationOperation modOp, ServerEntry mods ) throws Exception
     {
         if ( mods instanceof ClonedServerEntry )
         {
@@ -1220,7 +1220,7 @@
     }
 
 
-    public void modify( LdapDN dn, List<Modification> mods ) throws Exception
+    public void modify( DN dn, List<Modification> mods ) throws Exception
     {
         Long id = getEntryId( dn.toString() );
         modify( id, mods );
@@ -1258,11 +1258,11 @@
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         Long childId = getEntryId( oldChildDn.toString() );
         rename( oldChildDn, newRdn, deleteOldRdn );
-        LdapDN newUpdn = move( oldChildDn, childId, newParentDn );
+        DN newUpdn = move( oldChildDn, childId, newParentDn );
 
         // Update the current entry
         ServerEntry entry = lookup( childId );
@@ -1271,10 +1271,10 @@
     }
 
 
-    public void move( LdapDN oldChildDn, LdapDN newParentDn ) throws Exception
+    public void move( DN oldChildDn, DN newParentDn ) throws Exception
     {
         Long childId = getEntryId( oldChildDn.toString() );
-        LdapDN newUpdn = move( oldChildDn, childId, newParentDn );
+        DN newUpdn = move( oldChildDn, childId, newParentDn );
 
         // Update the current entry
         ServerEntry entry = lookup( childId );
@@ -1297,7 +1297,7 @@
      * @param newParentDn the normalized dn of the new parent for the child
      * @throws NamingException if something goes wrong
      */
-    private LdapDN move( LdapDN oldChildDn, Long childId, LdapDN newParentDn ) throws Exception
+    private DN move( DN oldChildDn, Long childId, DN newParentDn ) throws Exception
     {
         // Get the child and the new parent to be entries and Ids
         Long newParentId = getEntryId( newParentDn.toString() );
@@ -1327,9 +1327,9 @@
          * user provided RDN & the new parent's UPDN.  Basically add the child's
          * UpRdn String to the tail of the new parent's Updn Name.
          */
-        LdapDN childUpdn = new LdapDN( getEntryUpdn( childId ) );
+        DN childUpdn = new DN( getEntryUpdn( childId ) );
         String childRdn = childUpdn.get( childUpdn.size() - 1 );
-        LdapDN newUpdn = new LdapDN( getEntryUpdn( newParentId ) );
+        DN newUpdn = new DN( getEntryUpdn( newParentId ) );
         newUpdn.add( newUpdn.size(), childRdn );
 
         // Call the modifyDn operation with the new updn
@@ -1356,11 +1356,11 @@
      * @throws Exception if there are any errors propagating the name changes
      */
     @SuppressWarnings("unchecked")
-    public void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
+    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception
     {
         Long id = getEntryId( dn.getNormName() );
         ServerEntry entry = lookup( id );
-        LdapDN updn = entry.getDn();
+        DN updn = entry.getDn();
 
         /* 
          * H A N D L E   N E W   R D N
@@ -1462,7 +1462,7 @@
          *    entry and its descendants
          */
 
-        LdapDN newUpdn = ( LdapDN ) updn.clone(); // copy da old updn
+        DN newUpdn = ( DN ) updn.clone(); // copy da old updn
         newUpdn.remove( newUpdn.size() - 1 ); // remove old upRdn
         newUpdn.add( newRdn.getUpName() ); // add da new upRdn
 
@@ -1638,7 +1638,7 @@
         protect( "suffixDn" );
         try
         {
-            this.suffixDn = new LdapDN( suffixDn );
+            this.suffixDn = new DN( suffixDn );
         }
         catch ( InvalidNameException e )
         {
@@ -1737,15 +1737,15 @@
      * not allowed due to chaining or cycle formation.
      * @throws Exception if the wrappedCursor btrees cannot be altered
      */
-    private void addAliasIndices( Long aliasId, LdapDN aliasDn, String aliasTarget ) throws Exception
+    private void addAliasIndices( Long aliasId, DN aliasDn, String aliasTarget ) throws Exception
     {
-        LdapDN normalizedAliasTargetDn; // Name value of aliasedObjectName
+        DN normalizedAliasTargetDn; // Name value of aliasedObjectName
         Long targetId; // Id of the aliasedObjectName
-        LdapDN ancestorDn; // Name of an alias entry relative
+        DN ancestorDn; // Name of an alias entry relative
         Long ancestorId; // Id of an alias entry relative
 
         // Access aliasedObjectName, normalize it and generate the Name 
-        normalizedAliasTargetDn = new LdapDN( aliasTarget );
+        normalizedAliasTargetDn = new DN( aliasTarget );
         normalizedAliasTargetDn.normalize( schemaManager.getNormalizerMapping() );
 
         /*
@@ -1823,12 +1823,12 @@
          * index.  If the target is not a sibling of the alias then we add the
          * index entry maping the parent's id to the aliased target id.
          */
-        ancestorDn = ( LdapDN ) aliasDn.clone();
+        ancestorDn = ( DN ) aliasDn.clone();
         ancestorDn.remove( aliasDn.size() - 1 );
         ancestorId = getEntryId( ancestorDn.toNormName() );
 
         // check if alias parent and aliased entry are the same
-        LdapDN normalizedAliasTargetParentDn = ( LdapDN ) normalizedAliasTargetDn.clone();
+        DN normalizedAliasTargetParentDn = ( DN ) normalizedAliasTargetDn.clone();
         normalizedAliasTargetParentDn.remove( normalizedAliasTargetDn.size() - 1 );
         if ( !aliasDn.startsWith( normalizedAliasTargetParentDn ) )
         {
@@ -1872,7 +1872,7 @@
         String targetDn = aliasIdx.reverseLookup( aliasId );
         Long targetId = getEntryId( targetDn );
         String aliasDn = getEntryDn( aliasId );
-        LdapDN ancestorDn = ( LdapDN ) new LdapDN( aliasDn ).getPrefix( 1 );
+        DN ancestorDn = ( DN ) new DN( aliasDn ).getPrefix( 1 );
         Long ancestorId = getEntryId( ancestorDn.toString() );
 
         /*
@@ -1891,7 +1891,7 @@
 
         while ( !ancestorDn.equals( suffixDn ) )
         {
-            ancestorDn = ( LdapDN ) ancestorDn.getPrefix( 1 );
+            ancestorDn = ( DN ) ancestorDn.getPrefix( 1 );
             ancestorId = getEntryId( ancestorDn.toString() );
 
             subAliasIdx.drop( ancestorId, targetId );
@@ -1972,7 +1972,7 @@
      * @param movedBase the base at which the move occured - the moved node
      * @throws NamingException if system userIndices fail
      */
-    private void dropMovedAliasIndices( final LdapDN movedBase ) throws Exception
+    private void dropMovedAliasIndices( final DN movedBase ) throws Exception
     {
         //        // Find all the aliases from movedBase down
         //        IndexAssertion<Object,E> isBaseDescendant = new IndexAssertion<Object,E>()
@@ -2012,7 +2012,7 @@
      * @param movedBase the base where the move occured
      * @throws Exception if userIndices fail
      */
-    private void dropAliasIndices( Long aliasId, LdapDN movedBase ) throws Exception
+    private void dropAliasIndices( Long aliasId, DN movedBase ) throws Exception
     {
         String targetDn = aliasIdx.reverseLookup( aliasId );
         Long targetId = getEntryId( targetDn );
@@ -2022,7 +2022,7 @@
          * Start droping index tuples with the first ancestor right above the 
          * moved base.  This is the first ancestor effected by the move.
          */
-        LdapDN ancestorDn = ( LdapDN ) movedBase.getPrefix( 1 );
+        DN ancestorDn = ( DN ) movedBase.getPrefix( 1 );
         Long ancestorId = getEntryId( ancestorDn.toString() );
 
         /*
@@ -2046,7 +2046,7 @@
 
         while ( !ancestorDn.equals( suffixDn ) )
         {
-            ancestorDn = ( LdapDN ) ancestorDn.getPrefix( 1 );
+            ancestorDn = ( DN ) ancestorDn.getPrefix( 1 );
             ancestorId = getEntryId( ancestorDn.toString() );
 
             subAliasIdx.drop( ancestorId, targetId );

Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java Wed Mar  3 23:25:11 2010
@@ -56,7 +56,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -400,7 +400,7 @@
     @Test
     public void testFreshStore() throws Exception
     {
-        LdapDN dn = new LdapDN( "o=Good Times Co." );
+        DN dn = new DN( "o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         assertEquals( 1L, ( long ) store.getEntryId( dn.toNormName() ) );
         assertEquals( 11, store.count() );
@@ -435,7 +435,7 @@
         assertEquals( 10, store.count() );
 
         // add an alias and delete to test dropAliasIndices method
-        LdapDN dn = new LdapDN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
+        DN dn = new DN( "commonName=Jack Daniels,ou=Apache,ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
@@ -484,7 +484,7 @@
         assertFalse( cursor.next() );
 
         // dn id 12
-        LdapDN martinDn = new LdapDN( "cn=Marting King,ou=Sales,o=Good Times Co." );
+        DN martinDn = new DN( "cn=Marting King,ou=Sales,o=Good Times Co." );
         martinDn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, martinDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -499,7 +499,7 @@
         assertTrue( cursor.previous() );
         assertEquals( 12, ( long ) cursor.get().getId() );
 
-        LdapDN newParentDn = new LdapDN( "ou=Board of Directors,o=Good Times Co." );
+        DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co." );
         newParentDn.normalize( schemaManager.getNormalizerMapping() );
 
         store.move( martinDn, newParentDn );
@@ -509,7 +509,7 @@
         assertEquals( 12, ( long ) cursor.get().getId() );
 
         // dn id 13
-        LdapDN marketingDn = new LdapDN( "ou=Marketing,ou=Sales,o=Good Times Co." );
+        DN marketingDn = new DN( "ou=Marketing,ou=Sales,o=Good Times Co." );
         marketingDn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, marketingDn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -519,7 +519,7 @@
         store.add( entry );
 
         // dn id 14
-        LdapDN jimmyDn = new LdapDN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
+        DN jimmyDn = new DN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
         jimmyDn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, jimmyDn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -798,7 +798,7 @@
     @Test(expected = LdapNameNotFoundException.class)
     public void testAddWithoutParentId() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
+        DN dn = new DN( "cn=Marting King,ou=Not Present,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -811,7 +811,7 @@
     @Test(expected = LdapSchemaViolationException.class)
     public void testAddWithoutObjectClass() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Martin King,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=Martin King,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "ou", "Sales" );
@@ -823,7 +823,7 @@
     @Test
     public void testModifyAddOUAttrib() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -842,7 +842,7 @@
     @Test
     public void testRename() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -862,7 +862,7 @@
     @Test
     public void testRenameEscaped() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN dn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -877,7 +877,7 @@
 
         store.rename( dn, rdn, true );
 
-        LdapDN dn2 = new LdapDN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
+        DN dn2 = new DN( "sn=Ja\\+es,ou=Engineering,o=Good Times Co." );
         dn2.normalize( schemaManager.getNormalizerMapping() );
         Long id = store.getEntryId( dn2.getNormName() );
         assertNotNull( id );
@@ -889,7 +889,7 @@
     @Test
     public void testMove() throws Exception
     {
-        LdapDN childDn = new LdapDN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
+        DN childDn = new DN( "cn=Pivate Ryan,ou=Engineering,o=Good Times Co." );
         childDn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry childEntry = new DefaultServerEntry( schemaManager, childDn );
         childEntry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -900,7 +900,7 @@
 
         store.add( childEntry );
 
-        LdapDN parentDn = new LdapDN( "ou=Sales,o=Good Times Co." );
+        DN parentDn = new DN( "ou=Sales,o=Good Times Co." );
         parentDn.normalize( schemaManager.getNormalizerMapping() );
 
         RDN rdn = new RDN( "cn=Ryan" );
@@ -908,10 +908,10 @@
         store.move( childDn, parentDn, rdn, true );
 
         // to drop the alias indices   
-        childDn = new LdapDN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co." );
+        childDn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co." );
         childDn.normalize( schemaManager.getNormalizerMapping() );
 
-        parentDn = new LdapDN( "ou=Engineering,o=Good Times Co." );
+        parentDn = new DN( "ou=Engineering,o=Good Times Co." );
         parentDn.normalize( schemaManager.getNormalizerMapping() );
 
         assertEquals( 3, store.getSubAliasIndex().count() );
@@ -925,7 +925,7 @@
     @Test
     public void testModifyAdd() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -957,7 +957,7 @@
     @Test
     public void testModifyReplace() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -990,7 +990,7 @@
     @Test
     public void testModifyRemove() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
         List<Modification> mods = new ArrayList<Modification>();
@@ -1023,7 +1023,7 @@
     @Test
     public void testModifyReplaceNonExistingIndexAttribute() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=Tim B,ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "cn=Tim B,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         DefaultServerEntry entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Wed Mar  3 23:25:11 2010
@@ -43,7 +43,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.AttributeTypeOptions;
 
@@ -273,7 +273,7 @@
      * @param value the value to check for
      * @throws Exception if there are failures while comparing
      */
-    boolean compare( LdapDN dn, String oid, Object value ) throws Exception;
+    boolean compare( DN dn, String oid, Object value ) throws Exception;
     
     
     /**
@@ -287,7 +287,7 @@
      * @param ignoreReferral a flag to tell the server to ignore referrals
      * @throws Exception if there are failures while comparing
      */
-    boolean compare( LdapDN dn, String oid, Object value, boolean ignoreReferral ) throws Exception;
+    boolean compare( DN dn, String oid, Object value, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -305,7 +305,7 @@
      * @param dn the distinguished name of the entry to delete
      * @throws Exception if there are failures while deleting the entry
      */
-    void delete( LdapDN dn ) throws Exception;
+    void delete( DN dn ) throws Exception;
 
     
     /**
@@ -315,7 +315,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while deleting the entry
      */
-    void delete( LdapDN dn, LogChange log ) throws Exception;
+    void delete( DN dn, LogChange log ) throws Exception;
     
     
     void delete( InternalDeleteRequest deleteRequest ) throws Exception;
@@ -333,7 +333,7 @@
      * @param ignoreReferral a flag to tell the server to ignore referrals
      * @throws Exception if there are failures while deleting the entry
      */
-    void delete( LdapDN dn, boolean ignoreReferral ) throws Exception;
+    void delete( DN dn, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -346,13 +346,13 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while deleting the entry
      */
-    void delete( LdapDN dn, boolean ignoreReferral, LogChange log ) throws Exception;
+    void delete( DN dn, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
     /**
      * Checks to see if an entry exists. 
      */
-    boolean exists( LdapDN dn ) throws Exception;
+    boolean exists( DN dn ) throws Exception;
     
     
     /**
@@ -362,7 +362,7 @@
      * @param dn the name of the entry to lookup
      * @throws Exception if there are failures while looking up the entry
      */
-    ClonedServerEntry lookup( LdapDN dn ) throws Exception;
+    ClonedServerEntry lookup( DN dn ) throws Exception;
 
     /**
      * Looks up an entry in the server returning all attributes: both user and
@@ -372,7 +372,7 @@
      * @param atIds The list of attributes to return
      * @throws Exception if there are failures while looking up the entry
      */
-    ClonedServerEntry lookup( LdapDN dn, String[] atIds ) throws Exception;
+    ClonedServerEntry lookup( DN dn, String[] atIds ) throws Exception;
 
     
     /**
@@ -383,7 +383,7 @@
      * @param mods the list of modifications to apply
      * @throws Exception if there are failures while modifying the entry
      */
-    void modify( LdapDN dn, List<Modification> mods ) throws Exception;
+    void modify( DN dn, List<Modification> mods ) throws Exception;
     
     
     /**
@@ -395,7 +395,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while modifying the entry
      */
-    void modify( LdapDN dn, List<Modification> mods, LogChange log ) throws Exception;
+    void modify( DN dn, List<Modification> mods, LogChange log ) throws Exception;
     
     
     /**
@@ -409,7 +409,7 @@
      * @param mods the list of modifications to apply
      * @throws Exception if there are failures while modifying the entry
      */
-    void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral ) throws Exception;
+    void modify( DN dn, List<Modification> mods, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -424,7 +424,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while modifying the entry
      */
-    void modify( LdapDN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception;
+    void modify( DN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
     void modify( InternalModifyRequest modifyRequest ) throws Exception;
@@ -441,7 +441,7 @@
      * @param newParent the new parent under which the entry/branch is moved
      * @exception if there are failures while moving the entry/branch
      */
-    void move( LdapDN dn, LdapDN newParent ) throws Exception;
+    void move( DN dn, DN newParent ) throws Exception;
     
     
     /**
@@ -453,7 +453,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @exception if there are failures while moving the entry/branch
      */
-    void move( LdapDN dn, LdapDN newParent, LogChange log ) throws Exception;
+    void move( DN dn, DN newParent, LogChange log ) throws Exception;
     
     
     /**
@@ -465,7 +465,7 @@
      * @param ignoreReferral a flag to tell the server to ignore referrals
      * @exception if there are failures while moving the entry/branch
      */
-    void move( LdapDN dn, LdapDN newParent, boolean ignoreReferral ) throws Exception;
+    void move( DN dn, DN newParent, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -478,7 +478,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @exception if there are failures while moving the entry/branch
      */
-    void move( LdapDN dn, LdapDN newParent, boolean ignoreReferral, LogChange log ) throws Exception;
+    void move( DN dn, DN newParent, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
     /**
@@ -512,7 +512,7 @@
      * @exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception;
+    void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn ) throws Exception;
     
     
     /**
@@ -528,7 +528,7 @@
      * @exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
+    void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
     
     
     /**
@@ -544,7 +544,7 @@
      * @exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
+    void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -561,7 +561,7 @@
      * @exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( LdapDN dn, LdapDN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
+    void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
     /**
@@ -597,7 +597,7 @@
      * distinguished name is to be deleted from the entry
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
+    void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws Exception;
     
     
     /**
@@ -613,7 +613,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
+    void rename( DN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws Exception;
     
     
     /**
@@ -629,7 +629,7 @@
      * @param ignoreReferral a flag to tell the server to ignore referrals
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
+    void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws Exception;
     
     
     /**
@@ -646,7 +646,7 @@
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( LdapDN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
+    void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log ) throws Exception;
     
     
     /**
@@ -679,7 +679,7 @@
      * @param returningAttributes the attributes to return
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor list( LdapDN dn, AliasDerefMode aliasDerefMode, 
+    EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode, 
         Set<AttributeTypeOptions> returningAttributes ) throws Exception;
     
     
@@ -698,7 +698,7 @@
      * terminating the search
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor list( LdapDN dn, AliasDerefMode aliasDerefMode, 
+    EntryFilteringCursor list( DN dn, AliasDerefMode aliasDerefMode, 
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
     
     
@@ -711,7 +711,7 @@
      * @param filter the search filter
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor search( LdapDN dn, String filter ) throws Exception;
+    EntryFilteringCursor search( DN dn, String filter ) throws Exception;
     
     
     /**
@@ -724,7 +724,7 @@
      * @param ignoreReferrals a flag to tell the server to ignore referrals
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor search( LdapDN dn, String filter, boolean ignoreReferrals ) throws Exception;
+    EntryFilteringCursor search( DN dn, String filter, boolean ignoreReferrals ) throws Exception;
     
     
     /**
@@ -737,7 +737,7 @@
      * @param returningAttributes the attributes to return
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor search( LdapDN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, 
+    EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, 
         Set<AttributeTypeOptions> returningAttributes ) throws Exception;
     
     
@@ -764,7 +764,7 @@
      * terminating the search
      * @throws Exception if there are failures while listing children
      */
-    EntryFilteringCursor search( LdapDN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, 
+    EntryFilteringCursor search( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode, 
         Set<AttributeTypeOptions> returningAttributes, int sizeLimit, int timeLimit ) throws Exception;
 
 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Wed Mar  3 23:25:11 2010
@@ -37,7 +37,7 @@
 import org.apache.directory.server.core.schema.SchemaService;
 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;
 
 
@@ -196,7 +196,7 @@
      *
      * @return a logical session as a specific user
      */
-    CoreSession getSession( LdapDN principalDn, byte[] credentials ) throws Exception;
+    CoreSession getSession( DN principalDn, byte[] credentials ) throws Exception;
 
     
     /**
@@ -207,7 +207,7 @@
      *
      * @return a logical session as a specific user
      */
-    CoreSession getSession( LdapDN principalDn, byte[] credentials, String saslMechanism, String saslAuthId ) 
+    CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId ) 
         throws Exception;
 
     

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Wed Mar  3 23:25:11 2010
@@ -28,7 +28,7 @@
 
 import org.apache.directory.server.i18n.I18n;
 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.util.StringTools;
 
 
@@ -44,7 +44,7 @@
     private static final long serialVersionUID = 3906650782395676720L;
 
     /** the normalized distinguished name of the principal */
-    private LdapDN name;
+    private DN name;
 
     /** the no name anonymous user whose DN is the empty String */
     public static final LdapPrincipal ANONYMOUS = new LdapPrincipal();
@@ -67,7 +67,7 @@
      * @param name the normalized distinguished name of the principal
      * @param authenticationLevel the authentication level for this principal
      */
-    public LdapPrincipal( LdapDN name, AuthenticationLevel authenticationLevel )
+    public LdapPrincipal( DN name, AuthenticationLevel authenticationLevel )
     {
         this.name = name;
         
@@ -89,7 +89,7 @@
      * @param authenticationLevel the authentication level for this principal
      * @param userPassword The user password
      */
-    public LdapPrincipal( LdapDN name, AuthenticationLevel authenticationLevel, byte[] userPassword )
+    public LdapPrincipal( DN name, AuthenticationLevel authenticationLevel, byte[] userPassword )
     {
         this.name = name;
         this.authenticationLevel = authenticationLevel;
@@ -104,7 +104,7 @@
      */
     public LdapPrincipal()
     {
-        name = new LdapDN();
+        name = new DN();
         authenticationLevel = AuthenticationLevel.NONE;
         userPassword = null;
     }
@@ -112,13 +112,13 @@
 
     /**
      * Gets a cloned copy of the normalized distinguished name of this
-     * principal as a {@link LdapDN}.
+     * principal as a {@link DN}.
      *
-     * @return the cloned distinguished name of the principal as a {@link LdapDN}
+     * @return the cloned distinguished name of the principal as a {@link DN}
      */
-    public LdapDN getClonedName()
+    public DN getClonedName()
     {
-        return ( LdapDN ) name.clone();
+        return ( DN ) name.clone();
     }
 
 
@@ -192,7 +192,7 @@
     public void readExternal( ObjectInput in ) throws IOException , ClassNotFoundException
     {
         // Read the name
-        name = (LdapDN)in.readObject();
+        name = (DN)in.readObject();
         
         // read the authentication level
         int level = in.readInt();
@@ -214,7 +214,7 @@
         // Write the name
         if ( name == null )
         {
-            out.writeObject( LdapDN.EMPTY_LDAPDN );
+            out.writeObject( DN.EMPTY_DN );
         }
         else
         {

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/OperationManager.java Wed Mar  3 23:25:11 2010
@@ -41,7 +41,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;
 
 
 /**
@@ -62,13 +62,13 @@
     /**
      * TODO document after determining if this method should be here.
      */
-    LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
 
 
     /**
      * TODO document after determining if this method should be here.
      */
-    LdapDN getSuffix ( GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix ( GetSuffixOperationContext opContext ) throws Exception;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/ReferralManager.java Wed Mar  3 23:25:11 2010
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core;
 
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 /**
  * An interface for managing referrals in the server
@@ -62,7 +62,7 @@
      * @param dn The entry's DN we want to check
      * @return <code>true</code> if the DN is associated with a referral
      */
-    boolean isReferral( LdapDN dn );
+    boolean isReferral( DN dn );
     
     
     /**
@@ -74,7 +74,7 @@
      * @param dn The DN we want to check for a referral in its partents
      * @return <code>true</code> if there is a parent referral
      */
-    boolean hasParentReferral( LdapDN dn );
+    boolean hasParentReferral( DN dn );
     
     
     /**
@@ -83,7 +83,7 @@
      * @param dn The DN from which we want to get the parent referral
      * @return The parent referral of null if none is found
      */
-    ServerEntry getParentReferral( LdapDN dn );
+    ServerEntry getParentReferral( DN dn );
     
     
     /**
@@ -122,5 +122,5 @@
      * @param suffixes The partition DN to remove
      * @exception If the removal failed
      */
-    void remove( DirectoryService directoryService, LdapDN suffix ) throws Exception;
+    void remove( DirectoryService directoryService, DN suffix ) throws Exception;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/changelog/ChangeLogSearchEngine.java Wed Mar  3 23:25:11 2010
@@ -24,7 +24,7 @@
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.ldif.ChangeType;
-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.ObjectClass;
 
@@ -147,7 +147,7 @@
      * @return the set of changes that occurred on an entry
      * @throws Exception if there are failures accessing the store
      */
-    Cursor<ChangeLogEvent> find( LdapDN dn, RevisionOrder order ) throws Exception;
+    Cursor<ChangeLogEvent> find( DN dn, RevisionOrder order ) throws Exception;
     
     
     /**
@@ -159,7 +159,7 @@
      * @return the set of changes that occurred on an entry and/or it's descendants depending on the scope
      * @throws Exception if there are failures accessing the store
      */
-    Cursor<ChangeLogEvent> find( LdapDN base, Scope scope, RevisionOrder order ) throws Exception;
+    Cursor<ChangeLogEvent> find( DN base, Scope scope, RevisionOrder order ) throws Exception;
     
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Wed Mar  3 23:25:11 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -41,12 +41,12 @@
 {
     public static final SearchScope DEFAULT_SCOPE = SearchScope.ONELEVEL;
     public static final AliasDerefMode DEFAULT_ALIAS_DEREF_MODE = AliasDerefMode.DEREF_ALWAYS;
-    public static final LdapDN DEFAULT_BASE = new LdapDN();
+    public static final DN DEFAULT_BASE = new DN();
     public static final ExprNode DEFAULT_FILTER = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT_OID );
     
     private SearchScope scope = DEFAULT_SCOPE;
     private AliasDerefMode aliasDerefMode = DEFAULT_ALIAS_DEREF_MODE;
-    private LdapDN base = DEFAULT_BASE;
+    private DN base = DEFAULT_BASE;
     private ExprNode filter = DEFAULT_FILTER;
     private int eventMask = EventType.ALL_EVENT_TYPES_MASK;
     
@@ -104,7 +104,7 @@
     /**
      * @param base the base to set
      */
-    public void setBase( LdapDN base )
+    public void setBase( DN base )
     {
         this.base = base;
     }
@@ -115,14 +115,14 @@
      */
     public void setBase( String base ) throws Exception
     {
-        this.base = new LdapDN( base );
+        this.base = new DN( base );
     }
 
 
     /**
      * @return the base
      */
-    public LdapDN getBase()
+    public DN getBase()
     {
         return base;
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/BaseInterceptor.java Wed Mar  3 23:25:11 2010
@@ -49,7 +49,7 @@
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.invocation.InvocationStack;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -137,7 +137,7 @@
     }
 
 
-    public LdapDN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName ( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
     {
         return next.getMatchedName( opContext );
     }
@@ -149,7 +149,7 @@
     }
 
 
-    public LdapDN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
     {
         return next.getSuffix( opContext );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/Interceptor.java Wed Mar  3 23:25:11 2010
@@ -43,7 +43,7 @@
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
 import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 import java.util.Set;
 
@@ -143,13 +143,13 @@
     /**
      * Filters {@link DefaultPartitionNexus#getMatchedName( GetMatchedNameOperationContext )} call.
      */
-    LdapDN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception;
 
 
     /**
      * Filters {@link DefaultPartitionNexus#getSuffix( GetSuffixOperationContext )} call.
      */
-    LdapDN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix ( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/InterceptorChain.java Wed Mar  3 23:25:11 2010
@@ -57,7 +57,7 @@
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.i18n.I18n;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -109,15 +109,15 @@
         }
 
 
-        public LdapDN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
+        public DN getMatchedName( NextInterceptor next, GetMatchedNameOperationContext opContext ) throws Exception
         {
-            return ( LdapDN ) nexus.getMatchedName( opContext ).clone();
+            return ( DN ) nexus.getMatchedName( opContext ).clone();
         }
 
 
-        public LdapDN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
+        public DN getSuffix( NextInterceptor next, GetSuffixOperationContext opContext ) throws Exception
         {
-            return ( LdapDN ) nexus.getSuffix( opContext ).clone();
+            return ( DN ) nexus.getSuffix( opContext ).clone();
         }
 
 
@@ -562,7 +562,7 @@
     }
 
 
-    public LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
     {
         Entry entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -584,7 +584,7 @@
     }
 
 
-    public LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
     {
         Entry entry = getStartingEntry();
         Interceptor head = entry.interceptor;
@@ -1104,7 +1104,7 @@
                 }
 
 
-                public LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+                public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
                 {
                     Entry next = getNextEntry();
                     Interceptor interceptor = next.interceptor;
@@ -1125,7 +1125,7 @@
                 }
 
 
-                public LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+                public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
                 {
                     Entry next = getNextEntry();
                     Interceptor interceptor = next.interceptor;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/NextInterceptor.java Wed Mar  3 23:25:11 2010
@@ -43,7 +43,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;
 
 
 /**
@@ -71,13 +71,13 @@
     /**
      * Calls the next interceptor's {@link Interceptor#getMatchedName( NextInterceptor, GetMatchedNameOperationContext )}.
      */
-    LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
+    DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception;
 
 
     /**
      * Calls the next interceptor's {@link Interceptor#getSuffix( NextInterceptor, GetSuffixOperationContext )}.
      */
-    LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception;
+    DN getSuffix( GetSuffixOperationContext opContext ) throws Exception;
 
 
     /**

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractChangeOperationContext.java Wed Mar  3 23:25:11 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.changelog.ChangeLogEvent;
 import org.apache.directory.server.core.changelog.LogChange;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -46,7 +46,7 @@
     }
 
     
-    public AbstractChangeOperationContext( CoreSession session, LdapDN dn )
+    public AbstractChangeOperationContext( CoreSession session, DN dn )
     {
         super( session, dn );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Wed Mar  3 23:25:11 2010
@@ -33,7 +33,7 @@
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.entry.Modification;
 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;
 
 
 /**
@@ -48,7 +48,7 @@
     protected static final Control[] EMPTY_CONTROLS = new Control[0];
 
     /** The DN associated with the context */
-    protected LdapDN dn;
+    protected DN dn;
     
     /** The entry associated with the target entry of this OperationContext */
     protected ClonedServerEntry entry;
@@ -89,7 +89,7 @@
      *
      * @param dn The associated DN
      */
-    public AbstractOperationContext( CoreSession session, LdapDN dn )
+    public AbstractOperationContext( CoreSession session, DN dn )
     {
         this.dn = dn;
         this.session = session;
@@ -121,7 +121,7 @@
     /**
      * @return The associated DN
      */
-    public LdapDN getDn()
+    public DN getDn()
     {
         return dn;
     }
@@ -132,7 +132,7 @@
      *
      * @param dn The DN to set
      */
-    public void setDn( LdapDN dn )
+    public void setDn( DN dn )
     {
         this.dn = dn;
     }
@@ -283,7 +283,7 @@
     }
     
     
-    public boolean hasEntry( LdapDN dn, Collection<String> byPassed ) throws Exception
+    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws Exception
     {
         EntryOperationContext opContext = new EntryOperationContext( session, dn );
         setup( opContext );
@@ -301,7 +301,7 @@
     }
     
     
-    public void delete( LdapDN dn, Collection<String> byPassed ) throws Exception
+    public void delete( DN dn, Collection<String> byPassed ) throws Exception
     {
         DeleteOperationContext opContext = new DeleteOperationContext( session, dn );
         setup( opContext );
@@ -310,7 +310,7 @@
     }
     
     
-    public void modify( LdapDN dn, List<Modification> mods, Collection<String> byPassed ) throws Exception
+    public void modify( DN dn, List<Modification> mods, Collection<String> byPassed ) throws Exception
     {
         ModifyOperationContext opContext = new ModifyOperationContext( session, dn, mods );
         setup( opContext );
@@ -320,7 +320,7 @@
     
     
     // TODO - need synchronization here and where we update links
-    public LookupOperationContext newLookupContext( LdapDN dn )
+    public LookupOperationContext newLookupContext( DN dn )
     {
         LookupOperationContext opContext = new LookupOperationContext( session, dn );
         setup( opContext );
@@ -338,7 +338,7 @@
     }
 
 
-    public ClonedServerEntry lookup( LdapDN dn, Collection<String> byPassed ) throws Exception
+    public ClonedServerEntry lookup( DN dn, Collection<String> byPassed ) throws Exception
     {
         LookupOperationContext opContext = newLookupContext( dn );
         opContext.setByPassed( byPassed );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Wed Mar  3 23:25:11 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -56,7 +56,7 @@
      * @param session the current Session 
      * @param dn the name of the entry being added
      */
-    public AddOperationContext( CoreSession session, LdapDN dn )
+    public AddOperationContext( CoreSession session, DN dn )
     {
         super( session, dn );
     }
@@ -82,7 +82,7 @@
      * @param dn the name of the entry being added
      * @param entry the entry being added
      */
-    public AddOperationContext( CoreSession session, LdapDN dn, ServerEntry entry )
+    public AddOperationContext( CoreSession session, DN dn, ServerEntry entry )
     {
         super( session, dn );
         this.entry = new ClonedServerEntry( entry );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Wed Mar  3 23:25:11 2010
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Modification;
 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.util.StringTools;
 
 
@@ -62,7 +62,7 @@
     private static final Control[] EMPTY_CONTROLS = new Control[0];
 
     /** The DN associated with the context */
-    private LdapDN dn;
+    private DN dn;
     
     /** The associated request's controls */
     private Map<String, Control> requestControls = new HashMap<String, Control>(4);
@@ -242,7 +242,7 @@
     /**
      * @return The associated DN
      */
-    public LdapDN getDn()
+    public DN getDn()
     {
         return dn;
     }
@@ -253,7 +253,7 @@
      *
      * @param dn The DN to set
      */
-    public void setDn( LdapDN dn )
+    public void setDn( DN dn )
     {
         this.dn = dn;
     }
@@ -383,7 +383,7 @@
     }
     
     
-    public LookupOperationContext newLookupContext( LdapDN dn )
+    public LookupOperationContext newLookupContext( DN dn )
     {
         return new LookupOperationContext( session, dn );
     }
@@ -395,7 +395,7 @@
     }
 
 
-    public ClonedServerEntry lookup( LdapDN dn, Collection<String> byPassed ) throws Exception
+    public ClonedServerEntry lookup( DN dn, Collection<String> byPassed ) throws Exception
     {
         LookupOperationContext opContext = newLookupContext( dn );
         opContext.setByPassed( byPassed );
@@ -465,13 +465,13 @@
     }
 
 
-    public void delete( LdapDN dn, Collection<String> bypass ) throws Exception
+    public void delete( DN dn, Collection<String> bypass ) throws Exception
     {
         throw new NotImplementedException();
     }
 
 
-    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
     {
         throw new NotImplementedException();
     }
@@ -486,7 +486,7 @@
     }
     
     
-    public boolean hasEntry( LdapDN dn, Collection<String> byPassed ) throws Exception
+    public boolean hasEntry( DN dn, Collection<String> byPassed ) throws Exception
     {
         EntryOperationContext opContext = new EntryOperationContext( session, dn );
         setup( opContext );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Wed Mar  3 23:25:11 2010
@@ -26,7 +26,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -62,7 +62,7 @@
      * Creates a new instance of CompareOperationContext.
      *
      */
-    public CompareOperationContext( CoreSession session, LdapDN dn )
+    public CompareOperationContext( CoreSession session, DN dn )
     {
         super( session, dn );
     }
@@ -85,7 +85,7 @@
      * Creates a new instance of LookupOperationContext.
      *
      */
-    public CompareOperationContext( CoreSession session, LdapDN dn, String oid )
+    public CompareOperationContext( CoreSession session, DN dn, String oid )
     {
         super( session, dn );
         this.oid = oid;
@@ -97,7 +97,7 @@
      * Creates a new instance of LookupOperationContext.
      *
      */
-    public CompareOperationContext( CoreSession session, LdapDN dn, String oid, Value<?> value )
+    public CompareOperationContext( CoreSession session, DN dn, String oid, Value<?> value )
     {
         super( session, dn );
         this.oid = oid;

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Wed Mar  3 23:25:11 2010
@@ -25,7 +25,7 @@
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -58,7 +58,7 @@
      *
      * @param deleteDn The entry DN to delete
      */
-    public DeleteOperationContext( CoreSession session, LdapDN deleteDn )
+    public DeleteOperationContext( CoreSession session, DN deleteDn )
     {
         super( session, deleteDn );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EmptyOperationContext.java Wed Mar  3 23:25:11 2010
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -39,7 +39,7 @@
      */
     public EmptyOperationContext( CoreSession session )
     {
-        super( session, LdapDN.EMPTY_LDAPDN );
+        super( session, DN.EMPTY_DN );
     }
     
 
@@ -48,9 +48,9 @@
      *
      * @param dn The DN to set
      */
-    public void setDn( LdapDN dn )
+    public void setDn( DN dn )
     {
-        if ( dn.equals( LdapDN.EMPTY_LDAPDN ) )
+        if ( dn.equals( DN.EMPTY_DN ) )
         {
             return;
         }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/EntryOperationContext.java Wed Mar  3 23:25:11 2010
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -47,7 +47,7 @@
      *
      * @param entryDn The Entry DN to unbind
      */
-    public EntryOperationContext( CoreSession session, LdapDN entryDn )
+    public EntryOperationContext( CoreSession session, DN entryDn )
     {
         super( session, entryDn );
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java?rev=918766&r1=918765&r2=918766&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/GetMatchedNameOperationContext.java Wed Mar  3 23:25:11 2010
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -46,7 +46,7 @@
      *
      * @param dn The DN to match
      */
-    public GetMatchedNameOperationContext( CoreSession session, LdapDN dn )
+    public GetMatchedNameOperationContext( CoreSession session, DN dn )
     {
         super( session, dn );
     }



Mime
View raw message