directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [4/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/sr...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ComparatorSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -33,8 +33,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.LdapComparator;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -73,7 +73,7 @@ public class ComparatorSynchronizer exte
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
@@ -99,11 +99,11 @@ public class ComparatorSynchronizer exte
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=comparators,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=comparators,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.COMPARATOR );
 
         // The new schemaObject's OID must not already exist
@@ -147,11 +147,11 @@ public class ComparatorSynchronizer exte
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=comparators,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=comparators,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.COMPARATOR );
 
         // Get the SchemaName
@@ -223,7 +223,7 @@ public class ComparatorSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
 
@@ -246,8 +246,8 @@ public class ComparatorSynchronizer exte
             checkOidIsUnique( newOid );
             targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
-            // Inject the new DN
-            DN newDn = new DN( targetEntry.getDn() );
+            // Inject the new Dn
+            Dn newDn = new Dn( targetEntry.getDn() );
             newDn = newDn.remove( newDn.size() - 1 );
             newDn = newDn.add( newRdn );
             targetEntry.setDn( newDn );
@@ -261,7 +261,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRdn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -295,7 +295,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -367,7 +367,7 @@ public class ComparatorSynchronizer exte
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
@@ -375,7 +375,7 @@ public class ComparatorSynchronizer exte
                 I18n.err( I18n.ERR_357 ) );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
 
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitContentRuleSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -81,9 +81,9 @@ public class DitContentRuleSynchronizer 
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, java.lang.String, boolean, javax.naming.directory.Attributes)
+     * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, java.lang.String, boolean, javax.naming.directory.Attributes)
      */
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -91,9 +91,9 @@ public class DitContentRuleSynchronizer 
 
 
     /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
+     * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn, javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, Entry entry, 
+    public void move( Dn oriChildName, Dn newParentName, Entry entry,
         boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -103,7 +103,7 @@ public class DitContentRuleSynchronizer 
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/DitStructureRuleSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -81,11 +81,11 @@ public class DitStructureRuleSynchronize
 
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(
-     * org.apache.directory.shared.ldap.name.DN, 
-     * org.apache.directory.shared.ldap.name.DN, 
+     * org.apache.directory.shared.ldap.name.Dn,
+     * org.apache.directory.shared.ldap.name.Dn,
      * java.lang.String, boolean, javax.naming.directory.Attributes)
      */
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -94,11 +94,11 @@ public class DitStructureRuleSynchronize
 
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(
-     * org.apache.directory.shared.ldap.name.DN, 
-     * org.apache.directory.shared.ldap.name.DN, 
+     * org.apache.directory.shared.ldap.name.Dn,
+     * org.apache.directory.shared.ldap.name.Dn,
      * javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, Entry entry, 
+    public void move( Dn oriChildName, Dn newParentName, Entry entry,
         boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -108,7 +108,7 @@ public class DitStructureRuleSynchronize
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -29,8 +29,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -69,7 +69,7 @@ public class MatchingRuleSynchronizer ex
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         MatchingRule mr = factory.getMatchingRule( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -96,11 +96,11 @@ public class MatchingRuleSynchronizer ex
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=matchingrules,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=matchingrules,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.MATCHING_RULE );
 
         // The new schemaObject's OID must not already exist
@@ -144,11 +144,11 @@ public class MatchingRuleSynchronizer ex
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=matchingrules,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=matchingrules,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.MATCHING_RULE );
 
         // Get the SchemaName
@@ -195,7 +195,7 @@ public class MatchingRuleSynchronizer ex
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
         MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -220,7 +220,7 @@ public class MatchingRuleSynchronizer ex
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRdn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -256,7 +256,7 @@ public class MatchingRuleSynchronizer ex
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -286,7 +286,7 @@ public class MatchingRuleSynchronizer ex
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
@@ -294,7 +294,7 @@ public class MatchingRuleSynchronizer ex
                 I18n.err( I18n.ERR_361 ) );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
         
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -79,14 +79,14 @@ public class MatchingRuleUseSynchronizer
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }
 
 
-    public void move( DN oriChildName, DN newParentName,
+    public void move( Dn oriChildName, Dn newParentName,
         Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -96,7 +96,7 @@ public class MatchingRuleUseSynchronizer
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NameFormSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.NameForm;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
@@ -79,10 +79,10 @@ public class NameFormSynchronizer extend
 
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(
-     * org.apache.directory.shared.ldap.name.DN, org.apache.directory.shared.ldap.name.DN, 
-     * RDN, boolean, javax.naming.directory.Attributes)
+     * org.apache.directory.shared.ldap.name.Dn, org.apache.directory.shared.ldap.name.Dn,
+     * Rdn, boolean, javax.naming.directory.Attributes)
      */
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn,
         boolean deleteOldRn, Entry entry, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -91,10 +91,10 @@ public class NameFormSynchronizer extend
 
     /* (non-Javadoc)
      * @see org.apache.directory.server.core.schema.SchemaChangeHandler#move(
-     * org.apache.directory.shared.ldap.name.DN, 
-     * org.apache.directory.shared.ldap.name.DN, javax.naming.directory.Attributes)
+     * org.apache.directory.shared.ldap.name.Dn,
+     * org.apache.directory.shared.ldap.name.Dn, javax.naming.directory.Attributes)
      */
-    public void move( DN oriChildName, DN newParentName, Entry entry, 
+    public void move( Dn oriChildName, Dn newParentName, Entry entry,
         boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
@@ -104,7 +104,7 @@ public class NameFormSynchronizer extend
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         // TODO Auto-generated method stub
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/NormalizerSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -33,8 +33,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.Normalizer;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -72,7 +72,7 @@ public class NormalizerSynchronizer exte
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oldOid = getOid( entry );
@@ -98,11 +98,11 @@ public class NormalizerSynchronizer exte
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=normalizers,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=normalizers,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.NORMALIZER );
 
         // The new schemaObject's OID must not already exist
@@ -156,11 +156,11 @@ public class NormalizerSynchronizer exte
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=normalizers,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=normalizers,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.NORMALIZER );
 
         // Get the Normalizer from the given entry ( it has been grabbed from the server earlier)
@@ -198,7 +198,7 @@ public class NormalizerSynchronizer exte
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -218,8 +218,8 @@ public class NormalizerSynchronizer exte
             Entry targetEntry = ( Entry ) entry.clone();
             targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
-            // Inject the new DN
-            DN newDn = new DN( targetEntry.getDn() );
+            // Inject the new Dn
+            Dn newDn = new Dn( targetEntry.getDn() );
             newDn = newDn.remove( newDn.size() - 1 );
             newDn = newDn.add( newRdn );
             targetEntry.setDn( newDn );
@@ -232,7 +232,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRdn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -263,7 +263,7 @@ public class NormalizerSynchronizer exte
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -313,14 +313,14 @@ public class NormalizerSynchronizer exte
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
             throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_370 ) );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
 
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ObjectClassSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -29,8 +29,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Schema;
@@ -68,7 +68,7 @@ public class ObjectClassSynchronizer ext
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String oid = getOid( entry );
         ObjectClass oc = factory.getObjectClass( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -92,11 +92,11 @@ public class ObjectClassSynchronizer ext
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=objectclasses,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=objectclasses,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.OBJECT_CLASS );
 
         // The new schemaObject's OID must not already exist
@@ -141,11 +141,11 @@ public class ObjectClassSynchronizer ext
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=objectclasses,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=objectclasses,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.OBJECT_CLASS );
 
         // Get the ObjectClass from the given entry ( it has been grabbed from the server earlier)
@@ -191,7 +191,7 @@ public class ObjectClassSynchronizer ext
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String schemaName = getSchemaName( entry.getDn() );
         ObjectClass oldOc = factory.getObjectClass( schemaManager, entry, schemaManager.getRegistries(), schemaName );
@@ -212,8 +212,8 @@ public class ObjectClassSynchronizer ext
         String newOid = newRdn.getNormValue().getString();
         targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
 
-        // Inject the new DN
-        DN newDn = new DN( targetEntry.getDn() );
+        // Inject the new Dn
+        Dn newDn = new Dn( targetEntry.getDn() );
         newDn = newDn.remove( newDn.size() - 1 );
         newDn = newDn.add( newRdn );
 
@@ -241,7 +241,7 @@ public class ObjectClassSynchronizer ext
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRdn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -287,7 +287,7 @@ public class ObjectClassSynchronizer ext
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oldSchemaName = getSchemaName( oriChildName );
@@ -327,7 +327,7 @@ public class ObjectClassSynchronizer ext
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
@@ -336,7 +336,7 @@ public class ObjectClassSynchronizer ext
                 "The parent dn of a objectClass should be at most 3 name components in length." );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
 
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/RegistrySynchronizer.java Sun Jan 23 01:17:06 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 
 
 /**
@@ -69,7 +69,7 @@ public interface RegistrySynchronizer
      * @param cascaded unused
      * @throws Exception If the rename failed
      */
-    void rename( Entry entry, RDN newRdn, boolean cascaded ) throws LdapException;
+    void rename( Entry entry, Rdn newRdn, boolean cascaded ) throws LdapException;
     
 
     /**
@@ -84,8 +84,8 @@ public interface RegistrySynchronizer
     boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascaded )
         throws LdapException;
     
-    void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, Entry entry,
+    void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn, Entry entry,
         boolean cascaded ) throws LdapException;
     
-    void move( DN oriChildName, DN newParentName, Entry entry, boolean cascaded ) throws LdapException;
+    void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascaded ) throws LdapException;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SchemaSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -40,8 +40,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
@@ -83,8 +83,8 @@ public class SchemaSynchronizer implemen
     /** The m-dependencies AttributeType */
     private final AttributeType dependenciesAT;
 
-    /** A static DN referencing ou=schema */
-    private final DN ouSchemaDN;
+    /** A static Dn referencing ou=schema */
+    private final Dn ouSchemaDn;
 
     /**
      * Creates and initializes a new instance of Schema synchronizer
@@ -102,7 +102,7 @@ public class SchemaSynchronizer implemen
         dependenciesAT = registries.getAttributeTypeRegistry()
             .lookup( MetaSchemaConstants.M_DEPENDENCIES_AT );
 
-        ouSchemaDN = new DN( SchemaConstants.OU_SCHEMA, schemaManager );
+        ouSchemaDn = new Dn( SchemaConstants.OU_SCHEMA, schemaManager );
     }
 
 
@@ -144,7 +144,7 @@ public class SchemaSynchronizer implemen
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn, Entry entry, boolean cascaded ) throws LdapException
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn, Entry entry, boolean cascaded ) throws LdapException
     {
 
     }
@@ -158,14 +158,14 @@ public class SchemaSynchronizer implemen
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
         parentDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
 
-        if ( !parentDn.equals( ouSchemaDN ) )
+        if ( !parentDn.equals(ouSchemaDn) )
         {
-            throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_380, ouSchemaDN.getName(),
+            throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, I18n.err( I18n.ERR_380, ouSchemaDn.getName(),
                     parentDn.getNormName() ) );
         }
 
@@ -260,7 +260,7 @@ public class SchemaSynchronizer implemen
      * @param entry the entry of the metaSchema object before the rename
      * @param newRdn the new commonName of the metaSchema object
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String rdnAttribute = newRdn.getUpType();
         String rdnAttributeOid = registries.getAttributeTypeRegistry().getOidByName( rdnAttribute );
@@ -342,7 +342,7 @@ public class SchemaSynchronizer implemen
      * Moves are not allowed for metaSchema objects so this always throws an
      * UNWILLING_TO_PERFORM LdapException.
      */
-    public void moveAndRename( DN oriChildName, DN newParentName, String newRn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, String newRn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapUnwillingToPerformException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
@@ -354,7 +354,7 @@ public class SchemaSynchronizer implemen
      * Moves are not allowed for metaSchema objects so this always throws an
      * UNWILLING_TO_PERFORM LdapException.
      */
-    public void move( DN oriChildName, DN newParentName,
+    public void move( Dn oriChildName, Dn newParentName,
         Entry entry, boolean cascade ) throws LdapUnwillingToPerformException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
@@ -392,7 +392,7 @@ public class SchemaSynchronizer implemen
     private boolean modifyDisable( ModifyOperationContext modifyContext, ModificationOperation modOp,
         EntryAttribute disabledInMods, EntryAttribute disabledInEntry ) throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
 
         switch ( modOp )
         {
@@ -470,7 +470,7 @@ public class SchemaSynchronizer implemen
     }
 
 
-    private String getSchemaName( DN schema )
+    private String getSchemaName( Dn schema )
     {
         return schema.getRdn().getNormValue().getString();
     }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/SyntaxCheckerSynchronizer.java Sun Jan 23 01:17:06 2011
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.schema.registries.Registries;
@@ -71,7 +71,7 @@ public class SyntaxCheckerSynchronizer e
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String schemaName = getSchemaName( name );
         String oid = getOid( entry );
@@ -97,11 +97,11 @@ public class SyntaxCheckerSynchronizer e
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=syntaxcheckers,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=syntaxcheckers,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.SYNTAX_CHECKER );
 
         // The new schemaObject's OID must not already exist
@@ -144,11 +144,11 @@ public class SyntaxCheckerSynchronizer e
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=syntaxcheckers,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=syntaxcheckers,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.SYNTAX_CHECKER );
 
         // Get the SyntaxChecker's instance
@@ -218,7 +218,7 @@ public class SyntaxCheckerSynchronizer e
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -250,7 +250,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRdn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRdn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -290,7 +290,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -350,7 +350,7 @@ public class SyntaxCheckerSynchronizer e
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
@@ -358,7 +358,7 @@ public class SyntaxCheckerSynchronizer e
                 I18n.err( I18n.ERR_396 ) );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )
         {

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=1062306&r1=1062305&r2=1062306&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 Sun Jan 23 01:17:06 2011
@@ -32,8 +32,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -75,7 +75,7 @@ public class SyntaxSynchronizer extends 
     public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
         throws LdapException
     {
-        DN name = modifyContext.getDn();
+        Dn name = modifyContext.getDn();
         Entry entry = modifyContext.getEntry();
         String oid = getOid( entry );
         LdapSyntax syntax = factory.getSyntax( schemaManager, targetEntry, schemaManager.getRegistries(),
@@ -99,11 +99,11 @@ public class SyntaxSynchronizer extends 
      */
     public void add( Entry entry ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=syntaxes,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=syntaxes,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.SYNTAX );
 
         // The new schemaObject's OID must not already exist
@@ -199,11 +199,11 @@ public class SyntaxSynchronizer extends 
      */
     public void delete( Entry entry, boolean cascade ) throws LdapException
     {
-        DN dn = entry.getDn();
-        DN parentDn = dn;
+        Dn dn = entry.getDn();
+        Dn parentDn = dn;
         parentDn = parentDn.remove( parentDn.size() - 1 );
 
-        // The parent DN must be ou=syntaxes,cn=<schemaName>,ou=schema
+        // The parent Dn must be ou=syntaxes,cn=<schemaName>,ou=schema
         checkParent( parentDn, schemaManager, SchemaConstants.SYNTAX );
 
         // Get the Syntax from the given entry ( it has been grabbed from the server earlier)
@@ -251,7 +251,7 @@ public class SyntaxSynchronizer extends 
     /**
      * {@inheritDoc}
      */
-    public void rename( Entry entry, RDN newRdn, boolean cascade ) throws LdapException
+    public void rename( Entry entry, Rdn newRdn, boolean cascade ) throws LdapException
     {
         String oldOid = getOid( entry );
         String schemaName = getSchemaName( entry.getDn() );
@@ -288,7 +288,7 @@ public class SyntaxSynchronizer extends 
     }
 
 
-    public void moveAndRename( DN oriChildName, DN newParentName, RDN newRn, boolean deleteOldRn,
+    public void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn,
         Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
@@ -334,7 +334,7 @@ public class SyntaxSynchronizer extends 
     }
 
 
-    public void move( DN oriChildName, DN newParentName, Entry entry, boolean cascade ) throws LdapException
+    public void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascade ) throws LdapException
     {
         checkNewParent( newParentName );
         String oid = getOid( entry );
@@ -377,7 +377,7 @@ public class SyntaxSynchronizer extends 
     }
 
 
-    private void checkNewParent( DN newParent ) throws LdapException
+    private void checkNewParent( Dn newParent ) throws LdapException
     {
         if ( newParent.size() != 3 )
         {
@@ -385,7 +385,7 @@ public class SyntaxSynchronizer extends 
                 I18n.err( I18n.ERR_402 ) );
         }
 
-        RDN rdn = newParent.getRdn();
+        Rdn rdn = newParent.getRdn();
         if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
             SchemaConstants.OU_AT_OID ) )
         {

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java Sun Jan 23 01:17:06 2011
@@ -65,8 +65,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.UnbindRequest;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
 import org.apache.directory.shared.util.Strings;
@@ -229,7 +229,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public boolean compare( DN dn, String oid, Object value ) throws LdapException
+    public boolean compare( Dn dn, String oid, Object value ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
 
@@ -240,7 +240,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public boolean compare( DN dn, String oid, Object value, boolean ignoreReferral ) throws LdapException
+    public boolean compare( Dn dn, String oid, Object value, boolean ignoreReferral ) throws LdapException
     {
         CompareOperationContext compareContext = new CompareOperationContext( this, dn, oid,
             convertToValue( oid, value ) );
@@ -255,7 +255,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void delete( DN dn ) throws LdapException
+    public void delete( Dn dn ) throws LdapException
     {
         delete( dn, LogChange.TRUE );
     }
@@ -264,7 +264,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void delete( DN dn, LogChange log ) throws LdapException
+    public void delete( Dn dn, LogChange log ) throws LdapException
     {
         DeleteOperationContext deleteContext = new DeleteOperationContext( this, dn );
 
@@ -278,7 +278,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void delete( DN dn, boolean ignoreReferral ) throws LdapException
+    public void delete( Dn dn, boolean ignoreReferral ) throws LdapException
     {
         delete( dn, ignoreReferral, LogChange.TRUE );
     }
@@ -287,7 +287,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void delete( DN dn, boolean ignoreReferral, LogChange log ) throws LdapException
+    public void delete( Dn dn, boolean ignoreReferral, LogChange log ) throws LdapException
     {
         DeleteOperationContext deleteContext = new DeleteOperationContext( this, dn );
 
@@ -436,9 +436,9 @@ public class MockCoreSession implements 
 
 
     /* (non-Javadoc)
-     * @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)
+     * @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( DN dn, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -451,9 +451,9 @@ public class MockCoreSession implements 
 
 
     /* (non-Javadoc)
-     * @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)
+     * @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( DN dn, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor list( Dn dn, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -470,7 +470,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public Entry lookup( DN dn ) throws LdapException
+    public Entry lookup( Dn dn ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
         return operationManager.lookup( new LookupOperationContext( this, dn ) );
@@ -480,7 +480,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public Entry lookup( DN dn, String... attrIds ) throws LdapException
+    public Entry lookup( Dn dn, String... attrIds ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
         return operationManager.lookup( new LookupOperationContext( this, dn, attrIds ) );
@@ -490,7 +490,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public Entry lookup( DN dn, Control[] controls, String... attrIds ) throws LdapException
+    public Entry lookup( Dn dn, Control[] controls, String... attrIds ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
         LookupOperationContext lookupContext = new LookupOperationContext( this, dn, attrIds );
@@ -503,7 +503,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void modify( DN dn, List<Modification> mods ) throws LdapException
+    public void modify( Dn dn, List<Modification> mods ) throws LdapException
     {
         modify( dn, mods, LogChange.TRUE );
     }
@@ -512,7 +512,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void modify( DN dn, List<Modification> mods, LogChange log ) throws LdapException
+    public void modify( Dn dn, List<Modification> mods, LogChange log ) throws LdapException
     {
         if ( mods == null )
         {
@@ -538,7 +538,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void modify( DN dn, List<Modification> mods, boolean ignoreReferral ) throws LdapException
+    public void modify( Dn dn, List<Modification> mods, boolean ignoreReferral ) throws LdapException
     {
         modify( dn, mods, ignoreReferral, LogChange.TRUE );
     }
@@ -547,7 +547,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void modify( DN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws LdapException
+    public void modify( Dn dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws LdapException
     {
         if ( mods == null )
         {
@@ -574,7 +574,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void move( DN dn, DN newParent ) throws LdapException
+    public void move( Dn dn, Dn newParent ) throws LdapException
     {
         move( dn, newParent, LogChange.TRUE );
     }
@@ -583,7 +583,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void move( DN dn, DN newParent, LogChange log ) throws LdapException
+    public void move( Dn dn, Dn newParent, LogChange log ) throws LdapException
     {
         MoveOperationContext moveContext = new MoveOperationContext( this, dn, newParent );
 
@@ -597,7 +597,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void move( DN dn, DN newParent, boolean ignoreReferral ) throws Exception
+    public void move( Dn dn, Dn newParent, boolean ignoreReferral ) throws Exception
     {
         move( dn, newParent, ignoreReferral, LogChange.TRUE );
     }
@@ -606,7 +606,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void move( DN dn, DN newParent, boolean ignoreReferral, LogChange log ) throws LdapException
+    public void move( Dn dn, Dn newParent, boolean ignoreReferral, LogChange log ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
         MoveOperationContext moveContext = new MoveOperationContext( this, dn, newParent );
@@ -621,7 +621,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn ) throws LdapException
+    public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
     {
         moveAndRename( dn, newParent, newRdn, deleteOldRdn, LogChange.TRUE );
     }
@@ -630,7 +630,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, LogChange log )
+    public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, LogChange log )
         throws LdapException
     {
         MoveAndRenameOperationContext moveAndRenameContext = new MoveAndRenameOperationContext( this, dn, newParent,
@@ -646,7 +646,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral )
+    public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral )
         throws LdapException
     {
         moveAndRename( dn, newParent, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
@@ -656,7 +656,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc} 
      */
-    public void moveAndRename( DN dn, DN newParent, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral,
+    public void moveAndRename( Dn dn, Dn newParent, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral,
         LogChange log ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -673,7 +673,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
+    public void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn ) throws LdapException
     {
         rename( dn, newRdn, deleteOldRdn, LogChange.TRUE );
     }
@@ -682,7 +682,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException
+    public void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, LogChange log ) throws LdapException
     {
         RenameOperationContext renameContext = new RenameOperationContext( this, dn, newRdn, deleteOldRdn );
 
@@ -696,7 +696,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException
+    public void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral ) throws LdapException
     {
         rename( dn, newRdn, deleteOldRdn, ignoreReferral, LogChange.TRUE );
     }
@@ -705,7 +705,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log )
+    public void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, boolean ignoreReferral, LogChange log )
         throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -721,7 +721,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor search( DN dn, String filter ) throws LdapException
+    public EntryFilteringCursor search( Dn dn, String filter ) throws LdapException
     {
         return search( dn, filter, true );
     }
@@ -730,7 +730,7 @@ public class MockCoreSession implements 
     /**
      * {@inheritDoc}
      */
-    public EntryFilteringCursor search( DN dn, String filter, boolean ignoreReferrals ) throws LdapException
+    public EntryFilteringCursor search( Dn dn, String filter, boolean ignoreReferrals ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
         ExprNode filterNode = null;
@@ -754,9 +754,9 @@ public class MockCoreSession implements 
 
 
     /* (non-Javadoc)
-     * @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)
+     * @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( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -769,9 +769,9 @@ public class MockCoreSession implements 
 
 
     /* (non-Javadoc)
-     * @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)
+     * @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( DN dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
+    public EntryFilteringCursor search( Dn dn, SearchScope scope, ExprNode filter, AliasDerefMode aliasDerefMode,
         Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws LdapException
     {
         OperationManager operationManager = directoryService.getOperationManager();
@@ -828,7 +828,7 @@ public class MockCoreSession implements 
     }
 
 
-    public boolean exists( DN dn ) throws LdapException
+    public boolean exists( Dn dn ) throws LdapException
     {
         EntryOperationContext hasEntryContext = new EntryOperationContext( this, dn );
         OperationManager operationManager = directoryService.getOperationManager();

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
 
@@ -345,7 +345,7 @@ public class MockDirectoryService implem
     }
 
 
-    public Entry newEntry( DN dn ) throws LdapException
+    public Entry newEntry( Dn dn ) throws LdapException
     {
         return null;
     }
@@ -374,13 +374,13 @@ public class MockDirectoryService implem
     }
 
 
-    public CoreSession getSession( DN principalDn, byte[] credentials ) throws LdapException
+    public CoreSession getSession( Dn principalDn, byte[] credentials ) throws LdapException
     {
         return null;
     }
 
     
-    public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
+    public CoreSession getSession( Dn principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
         throws LdapException
     {
         return null;

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockOperation.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 public class MockOperation implements OperationContext
 {
@@ -44,7 +44,7 @@ public class MockOperation implements Op
     public MockOperation( int count ) throws Exception 
     {
         this.count = count;
-        this.session = new MockCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), 
+        this.session = new MockCoreSession( new LdapPrincipal( new Dn(), AuthenticationLevel.STRONG ),
             new MockDirectoryService( count ) );
     }
 
@@ -83,7 +83,7 @@ public class MockOperation implements Op
     }
 
 
-    public DN getDn()
+    public Dn getDn()
     {
         return null;
     }
@@ -167,7 +167,7 @@ public class MockOperation implements Op
     }
 
 
-    public ClonedServerEntry lookup( DN dn, Collection<String> bypass ) throws LdapException
+    public ClonedServerEntry lookup( Dn dn, Collection<String> bypass ) throws LdapException
     {
         return null;
     }
@@ -179,7 +179,7 @@ public class MockOperation implements Op
     }
 
 
-    public LookupOperationContext newLookupContext( DN dn )
+    public LookupOperationContext newLookupContext( Dn dn )
     {
         return null;
     }
@@ -195,7 +195,7 @@ public class MockOperation implements Op
     }
 
 
-    public void setDn( DN dn )
+    public void setDn( Dn dn )
     {
     }
 
@@ -241,17 +241,17 @@ public class MockOperation implements Op
     }
 
 
-    public void delete( DN dn, Collection<String> bypass ) throws LdapException
+    public void delete( Dn dn, Collection<String> bypass ) throws LdapException
     {
     }
 
 
-    public void modify( DN dn, List<Modification> mods, Collection<String> bypass ) throws LdapException
+    public void modify( Dn dn, List<Modification> mods, Collection<String> bypass ) throws LdapException
     {
     }
 
 
-    public boolean hasEntry( DN dn, Collection<String> byPass ) throws LdapException
+    public boolean hasEntry( Dn dn, Collection<String> byPass ) throws LdapException
     {
         return false;
     }

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,9 +56,9 @@ public class ClonedServerEntryTest
     @BeforeClass
     public static void initNames() throws Exception
     {
-        Entry eA = new DefaultEntry(new DN( "dc=example,dc=com" ));
-        Entry eB = new DefaultEntry(new DN( "dc=example,dc=com" ));
-        Entry eC = new DefaultEntry(new DN( "dc=test,dc=org" ));
+        Entry eA = new DefaultEntry(new Dn( "dc=example,dc=com" ));
+        Entry eB = new DefaultEntry(new Dn( "dc=example,dc=com" ));
+        Entry eC = new DefaultEntry(new Dn( "dc=test,dc=org" ));
 
         clonedServerEntryA = new ClonedServerEntry();
         clonedServerEntryACopy = new ClonedServerEntry();

Modified: directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Sun Jan 23 01:17:06 2011
@@ -53,7 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -97,7 +97,7 @@ public class SchemaAwareEntryTest
     // A Binary attribute
     private static AttributeType atPwd;
 
-    private static DN EXAMPLE_DN;
+    private static Dn EXAMPLE_DN;
 
 
     /**
@@ -139,7 +139,7 @@ public class SchemaAwareEntryTest
         atSN = schemaManager.lookupAttributeTypeRegistry( "sn" );
         atPwd = schemaManager.lookupAttributeTypeRegistry( "userpassword" );
 
-        EXAMPLE_DN = new DN( "dc=example,dc=com" );
+        EXAMPLE_DN = new Dn( "dc=example,dc=com" );
     }
 
 
@@ -154,7 +154,7 @@ public class SchemaAwareEntryTest
     {
         Entry entry = new DefaultEntry();
         assertNotNull( entry );
-        assertEquals( DN.EMPTY_DN, entry.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
     }
 
@@ -167,13 +167,13 @@ public class SchemaAwareEntryTest
     {
         Entry entry = new DefaultEntry( schemaManager );
         assertNotNull( entry );
-        assertEquals( DN.EMPTY_DN, entry.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry.getDn() );
         assertEquals( 0, entry.size() );
     }
 
 
     /**
-     * Test for method DefaultEntry( registries, DN )
+     * Test for method DefaultEntry( registries, Dn )
      */
     @Test
     public void testDefaultClientEntryRegistriesDN() throws Exception
@@ -186,7 +186,7 @@ public class SchemaAwareEntryTest
 
 
     /**
-     * Test for method DefaultEntry( registries, DN, AttributeType... )
+     * Test for method DefaultEntry( registries, Dn, AttributeType... )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNAttributeTypeArray() throws Exception
@@ -202,7 +202,7 @@ public class SchemaAwareEntryTest
 
 
     /**
-     * Test for method DefaultEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultEntry( registries, Dn, AttributeType, upId )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNAttributeTypeUpId() throws Exception
@@ -218,7 +218,7 @@ public class SchemaAwareEntryTest
 
 
     /**
-     * Test for method DefaultEntry( registries, DN, AttributeType, upId )
+     * Test for method DefaultEntry( registries, Dn, AttributeType, upId )
      */
     @Test
     public void testDefaultClientEntryRegistriesDNUpIdArray() throws Exception
@@ -650,7 +650,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtStringElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we can't inject a null AT
@@ -711,7 +711,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtBytesElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -792,7 +792,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddAtServerValueElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -909,7 +909,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdStringElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test a simple addition
@@ -962,7 +962,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdBytesElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1020,7 +1020,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdServerValueElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1132,7 +1132,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtStringElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test a simple addition
@@ -1182,7 +1182,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtBytesElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1240,7 +1240,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testAddUpIdAtServerValueElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -1383,7 +1383,7 @@ public class SchemaAwareEntryTest
         assertEquals( entry1, entry2 );
         entry2.setDn( EXAMPLE_DN );
 
-        assertEquals( DN.EMPTY_DN, entry1.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry1.getDn() );
 
         entry1.setDn( EXAMPLE_DN );
         entry2 = entry1.clone();
@@ -1803,7 +1803,7 @@ public class SchemaAwareEntryTest
 
         assertEquals( EXAMPLE_DN, entry.getDn() );
 
-        DN testDn = new DN( "cn=test" );
+        Dn testDn = new Dn( "cn=test" );
         entry.setDn( testDn );
 
         assertEquals( testDn, entry.getDn() );
@@ -1821,7 +1821,7 @@ public class SchemaAwareEntryTest
 
         assertEquals( entry1.hashCode(), entry2.hashCode() );
 
-        entry2.setDn( new DN( "ou=system,dc=com" ) );
+        entry2.setDn( new Dn( "ou=system,dc=com" ) );
         assertNotSame( entry1.hashCode(), entry2.hashCode() );
 
         entry2.setDn( EXAMPLE_DN );
@@ -2603,7 +2603,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutServerAttributeElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // first test a null SA addition. It should be allowed.
@@ -2684,7 +2684,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtStringElipsis() throws Exception
     {
-        DN dn = new DN( "dc=test" );
+        Dn dn = new Dn( "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test an empty AT
@@ -2741,7 +2741,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtByteElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test an empty AT
@@ -2804,7 +2804,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutAtSVs() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Adding a null value to an attribute
@@ -2865,7 +2865,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIdStringElipsis() throws Exception
     {
-        DN dn = new DN( "dc=test" );
+        Dn dn = new Dn( "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Adding a null value should be possible
@@ -2927,7 +2927,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIdBytesElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -2991,7 +2991,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtStringElipsis() throws Exception
     {
-        DN dn = new DN( "dc=test" );
+        Dn dn = new Dn( "dc=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3055,7 +3055,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtBytesElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -3130,7 +3130,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDAtSVElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3201,7 +3201,7 @@ public class SchemaAwareEntryTest
     @Test
     public void tesPutUpIDSVElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         // Test that we get an error when the ID or AT are null
@@ -3537,7 +3537,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testRemoveUpIdElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType atPassword = schemaManager.lookupAttributeTypeRegistry( "userPassword" );
@@ -3597,7 +3597,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testSetATElipsis() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         Entry entry = new DefaultEntry( schemaManager, dn );
 
         List<EntryAttribute> result = null;
@@ -3677,7 +3677,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testSetUpID() throws Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
         List<EntryAttribute> result = null;
 
@@ -3819,14 +3819,14 @@ public class SchemaAwareEntryTest
 
 
     /**
-     * Test method for setDN( DN )
+     * Test method for setDN( Dn )
      */
     @Test
     public void testSetDn()
     {
         Entry entry = new DefaultEntry( schemaManager );
 
-        assertEquals( DN.EMPTY_DN, entry.getDn() );
+        assertEquals( Dn.EMPTY_DN, entry.getDn() );
 
         entry.setDn( EXAMPLE_DN );
         assertEquals( EXAMPLE_DN, entry.getDn() );
@@ -3859,7 +3859,7 @@ public class SchemaAwareEntryTest
     @Test
     public void testToBasicAttributes() throws InvalidNameException, Exception
     {
-        DN dn = new DN( "cn=test" );
+        Dn dn = new Dn( "cn=test" );
         DefaultEntry entry = new DefaultEntry( schemaManager, dn );
 
         AttributeType OBJECT_CLASS_AT = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT );
@@ -3950,7 +3950,7 @@ public class SchemaAwareEntryTest
     public void testCopyConstructorClientEntry() throws LdapException
     {
         Entry clientEntry = new DefaultEntry();
-        clientEntry.setDn( new DN( "ou=system" ) );
+        clientEntry.setDn( new Dn( "ou=system" ) );
         clientEntry.add( "cn", "test1", "test2" );
         clientEntry.add( "objectClass", "top", "person" );
 



Mime
View raw message