directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [7/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-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java Sun Jan 23 01:17:06 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 import java.io.File;
 
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
-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.util.Strings;
 import org.junit.Before;
 
@@ -46,15 +46,15 @@ public abstract class AbstractMetaSchema
     /**
      * Get the path on disk where a specific SchemaObject is stored
      *
-     * @param dn the SchemaObject DN
+     * @param dn the SchemaObject Dn
      */
-    protected String getSchemaPath( DN dn )
+    protected String getSchemaPath( Dn dn )
     {
         StringBuilder sb = new StringBuilder();
 
         sb.append( workingDir ).append( '/' ).append( service.getSchemaService().getSchemaPartition().getId() ).append( '/' ).append( "ou=schema" );
 
-        for ( RDN rdn : dn )
+        for ( Rdn rdn : dn )
         {
             sb.append( '/' );
             sb.append( Strings.toLowerCase(rdn.getName()) );
@@ -70,9 +70,9 @@ public abstract class AbstractMetaSchema
      * Check that a specific SchemaObject is stored on the disk at the
      * correct position in the Ldif partition
      *
-     * @param dn The SchemaObject DN
+     * @param dn The SchemaObject Dn
      */
-    protected boolean isOnDisk( DN dn )
+    protected boolean isOnDisk( Dn dn )
     {
         // donot change the value of getSchemaPath to lowercase
         // on Linux this gives a wrong path
@@ -85,106 +85,106 @@ public abstract class AbstractMetaSchema
 
 
     /**
-     * Gets relative DN to ou=schema.
+     * Gets relative Dn to ou=schema.
      *
      * @param schemaName the name of the schema
      * @return the dn of the a schema entity container
      * @throws Exception on failure
      */
-    protected DN getSchemaContainer( String schemaName ) throws Exception
+    protected Dn getSchemaContainer( String schemaName ) throws Exception
     {
-        return new DN( "cn=" + schemaName );
+        return new Dn( "cn=" + schemaName );
     }
 
 
     /**
-     * Gets relative DN to ou=schema.
+     * Gets relative Dn to ou=schema.
      *
      * @param schemaName the name of the schema
      * @return the dn of the a schema's attributeType entity container
      * @throws Exception on failure
      */
-    protected DN getAttributeTypeContainer( String schemaName ) throws Exception
+    protected Dn getAttributeTypeContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=attributeTypes,cn=" + schemaName );
+        return new Dn( "ou=attributeTypes,cn=" + schemaName );
     }
 
 
     /**
-     * Get relative DN to ou=schema for Comparators
+     * Get relative Dn to ou=schema for Comparators
      *
      * @param schemaName the name of the schema
      * @return the dn to the ou under which comparators are found for a schema
      * @throws Exception if there are dn construction issues
      */
-    protected DN getComparatorContainer( String schemaName ) throws Exception
+    protected Dn getComparatorContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=comparators,cn=" + schemaName );
+        return new Dn( "ou=comparators,cn=" + schemaName );
     }
 
 
     /**
-     * Get relative DN to ou=schema for MatchingRules
+     * Get relative Dn to ou=schema for MatchingRules
      *
      * @param schemaName the name of the schema
      * @return the dn to the ou under which MatchingRules are found for a schema
      * @throws Exception if there are dn construction issues
      */
-    protected DN getMatchingRuleContainer( String schemaName ) throws Exception
+    protected Dn getMatchingRuleContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=matchingRules,cn=" + schemaName );
+        return new Dn( "ou=matchingRules,cn=" + schemaName );
     }
 
 
     /**
-     * Gets relative DN to ou=schema.
+     * Gets relative Dn to ou=schema.
      *
      * @param schemaName the name of the schema
      * @return the dn of the container which contains objectClasses
      * @throws Exception on error
      */
-    protected DN getObjectClassContainer( String schemaName ) throws Exception
+    protected Dn getObjectClassContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=objectClasses,cn=" + schemaName );
+        return new Dn( "ou=objectClasses,cn=" + schemaName );
     }
 
 
 
     /**
-     * Gets relative DN to ou=schema.
+     * Gets relative Dn to ou=schema.
      *
      * @param schemaName the name of the schema
      * @return  the name of the container with normalizer entries in it
      * @throws Exception on error
      */
-    protected DN getNormalizerContainer( String schemaName ) throws Exception
+    protected Dn getNormalizerContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=normalizers,cn=" + schemaName );
+        return new Dn( "ou=normalizers,cn=" + schemaName );
     }
 
 
     /**
-     * Get relative DN to ou=schema for Syntaxes
+     * Get relative Dn to ou=schema for Syntaxes
      *
      * @param schemaName the name of the schema
      * @return the dn of the container holding syntaxes for the schema
      * @throws Exception on dn parse errors
      */
-    protected DN getSyntaxContainer( String schemaName ) throws Exception
+    protected Dn getSyntaxContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=syntaxes,cn=" + schemaName );
+        return new Dn( "ou=syntaxes,cn=" + schemaName );
     }
 
 
     /**
-     * Get relative DN to ou=schema for SyntaxCheckers
+     * Get relative Dn to ou=schema for SyntaxCheckers
      *
      * @param schemaName the name of the schema
      * @return the dn of the container holding syntax checkers for the schema
      * @throws Exception on dn parse errors
      */
-    protected DN getSyntaxCheckerContainer( String schemaName ) throws Exception
+    protected Dn getSyntaxCheckerContainer( String schemaName ) throws Exception
     {
-        return new DN( "ou=syntaxCheckers,cn=" + schemaName );
+        return new Dn( "ou=syntaxCheckers,cn=" + schemaName );
     }
 }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Ignore;
@@ -91,7 +91,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-description: attribute certificate use ;binary"
          );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=2.5.4.58" );
 
         // Pre-checks
@@ -122,7 +122,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
         // Pre-checks
@@ -153,7 +153,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
 
-        DN dn = getAttributeTypeContainer( "notloaded" );
+        Dn dn = getAttributeTypeContainer( "notloaded" );
         dn = dn.add( "m-oid=" + OID );
 
         try
@@ -188,7 +188,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
 
-        DN dn = getAttributeTypeContainer( "nis" );
+        Dn dn = getAttributeTypeContainer( "nis" );
         dn = dn.add( "m-oid=" + OID );
 
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
@@ -225,7 +225,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-singleValue: TRUE"
          );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=1.3.6.1.4.1.8104.1.1.37" );
 
         // Pre-checks
@@ -250,7 +250,7 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
         // Check in Registries
@@ -282,7 +282,7 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToDisabledSchema();
 
-        DN dn = getAttributeTypeContainer( "nis" );
+        Dn dn = getAttributeTypeContainer( "nis" );
         dn = dn.add( "m-oid=" + OID );
 
         // Check in Registries
@@ -310,7 +310,7 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
         addDependeeAttributeType();
 
@@ -341,7 +341,7 @@ public class MetaAttributeTypeHandlerIT 
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
         ModificationItem[] mods = new ModificationItem[2];
@@ -373,7 +373,7 @@ public class MetaAttributeTypeHandlerIT 
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -403,10 +403,10 @@ public class MetaAttributeTypeHandlerIT 
         testAddAttributeTypeToEnabledSchema();
 
         LdapContext schemaRoot = getSchemaContext( service );
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = getAttributeTypeContainer( "apachemeta" );
+        Dn newdn = getAttributeTypeContainer( "apachemeta" );
         dn = newdn.add( "m-oid=" + NEW_OID );
         schemaRoot.rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -426,11 +426,11 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
         addDependeeAttributeType();
 
-        DN newdn = getAttributeTypeContainer( "apachemeta" );
+        Dn newdn = getAttributeTypeContainer( "apachemeta" );
         newdn = newdn.add( "m-oid=" + NEW_OID );
 
         try
@@ -457,13 +457,13 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = getAttributeTypeContainer( "apache" );
+        Dn newdn = getAttributeTypeContainer( "apache" );
         newdn = newdn.add( "m-oid=" + OID );
 
-        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName(newdn) );
 
         assertTrue( "attributeType OID should still be present",
                 service.getSchemaManager().getAttributeTypeRegistry().contains( OID ) );
@@ -479,10 +479,10 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = getAttributeTypeContainer( "apache" );
+        Dn newdn = getAttributeTypeContainer( "apache" );
         newdn = newdn.add( "m-oid=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -504,10 +504,10 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top = top.add( "m-oid=" + OID );
 
         try
@@ -531,10 +531,10 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid=" + OID );
 
         try
@@ -558,11 +558,11 @@ public class MetaAttributeTypeHandlerIT 
     {
         testAddAttributeTypeToEnabledSchema();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
         // nis is inactive by default
-        DN newdn = getAttributeTypeContainer( "nis" );
+        Dn newdn = getAttributeTypeContainer( "nis" );
         newdn = newdn.add( "m-oid=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -579,10 +579,10 @@ public class MetaAttributeTypeHandlerIT 
         testAddAttributeTypeToEnabledSchema();
         addDependeeAttributeType();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = getAttributeTypeContainer( "apache" );
+        Dn newdn = getAttributeTypeContainer( "apache" );
         newdn = newdn.add( "m-oid=" + OID );
 
         try
@@ -607,10 +607,10 @@ public class MetaAttributeTypeHandlerIT 
         testAddAttributeTypeToEnabledSchema();
         addDependeeAttributeType();
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + OID );
 
-        DN newdn = getAttributeTypeContainer( "apache" );
+        Dn newdn = getAttributeTypeContainer( "apache" );
         newdn = newdn.add( "m-oid=" + NEW_OID );
 
         try
@@ -645,7 +645,7 @@ public class MetaAttributeTypeHandlerIT 
             "m-usage: directoryOperation",
             "m-supAttributeType", OID );
 
-        DN dn = getAttributeTypeContainer( "apachemeta" );
+        Dn dn = getAttributeTypeContainer( "apachemeta" );
         dn = dn.add( "m-oid=" + DEPENDEE_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -665,13 +665,13 @@ public class MetaAttributeTypeHandlerIT 
         testAddAttributeTypeToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getAttributeTypeContainer( "nis" );
+        Dn dn = getAttributeTypeContainer( "nis" );
         dn.add( "m-oid=" + OID );
 
         assertFalse( "attributeType OID should NOT be present when added to disabled nis schema",
             service.getSchemaManager().getAttributeTypeRegistry().contains( OID ) );
 
-        DN newdn = getAttributeTypeContainer( "apachemeta" );
+        Dn newdn = getAttributeTypeContainer( "apachemeta" );
         newdn.add( "m-oid=" + OID );
 
         getSchemaContext( service ).rename( dn, newdn );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator;
@@ -104,7 +104,7 @@ public class MetaComparatorHandlerIT ext
             "objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
             "m-description: A test comparator" );
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -131,7 +131,7 @@ public class MetaComparatorHandlerIT ext
             "m-description: A test comparator" );
 
         // nis is by default inactive
-        DN dn = getComparatorContainer( "nis" );
+        Dn dn = getComparatorContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -156,7 +156,7 @@ public class MetaComparatorHandlerIT ext
             "m-description: A test comparator" );
 
         // nis is by default inactive
-        DN dn = getComparatorContainer( "notloaded" );
+        Dn dn = getComparatorContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -197,7 +197,7 @@ public class MetaComparatorHandlerIT ext
             "m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator", "m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -233,7 +233,7 @@ public class MetaComparatorHandlerIT ext
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
         // nis is by default inactive
-        DN dn = getComparatorContainer( "nis" );
+        Dn dn = getComparatorContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -257,7 +257,7 @@ public class MetaComparatorHandlerIT ext
     @Test
     public void testDeleteComparatorFromEnabledSchema() throws Exception
     {
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         testAddComparatorToEnabledSchema();
@@ -289,7 +289,7 @@ public class MetaComparatorHandlerIT ext
     @Test
     public void testDeleteComparatorFromDisabledSchema() throws Exception
     {
-        DN dn = getComparatorContainer( "nis" );
+        Dn dn = getComparatorContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddComparatorToDisabledSchema();
 
@@ -321,7 +321,7 @@ public class MetaComparatorHandlerIT ext
     @Test
     public void testDeleteComparatorWhenInUse() throws Exception
     {
-        DN cDn = getComparatorContainer( "apachemeta" );
+        Dn cDn = getComparatorContainer( "apachemeta" );
         cDn = cDn.add( "m-oid" + "=" + OID );
 
         // Create a new Comparator
@@ -338,7 +338,7 @@ public class MetaComparatorHandlerIT ext
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description: test" );
 
-        DN mrDn = getMatchingRuleContainer( "apachemeta" );
+        Dn mrDn = getMatchingRuleContainer( "apachemeta" );
         mrDn = mrDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -375,7 +375,7 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[1];
@@ -399,12 +399,12 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
         mods.put( "m-fqcn", BooleanComparator.class.getName() );
-        getSchemaContext( service ).modifyAttributes( JndiUtils.toName( dn ), DirContext.REPLACE_ATTRIBUTE, mods );
+        getSchemaContext( service ).modifyAttributes( JndiUtils.toName(dn), DirContext.REPLACE_ATTRIBUTE, mods );
 
         assertTrue( "comparator OID should still be present", schemaManager.getComparatorRegistry().contains( OID ) );
 
@@ -423,11 +423,11 @@ public class MetaComparatorHandlerIT ext
     @Ignore
     public void testRenameComparator() throws Exception
     {
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddComparatorToEnabledSchema();
 
-        DN newdn = getComparatorContainer( "apachemeta" );
+        Dn newdn = getComparatorContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -453,12 +453,12 @@ public class MetaComparatorHandlerIT ext
     @Ignore
     public void testRenameComparatorWhenInUse() throws Exception
     {
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN newdn = getComparatorContainer( "apachemeta" );
+        Dn newdn = getComparatorContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -487,10 +487,10 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getComparatorContainer( "apache" );
+        Dn newdn = getComparatorContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -511,10 +511,10 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getComparatorContainer( "apache" );
+        Dn newdn = getComparatorContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -541,10 +541,10 @@ public class MetaComparatorHandlerIT ext
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getComparatorContainer( "apache" );
+        Dn newdn = getComparatorContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -571,10 +571,10 @@ public class MetaComparatorHandlerIT ext
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getComparatorContainer( "apache" );
+        Dn newdn = getComparatorContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -604,10 +604,10 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top = top.add( "m-oid" + "=" + OID );
 
         try
@@ -631,10 +631,10 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=normalizers,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=normalizers,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -658,11 +658,11 @@ public class MetaComparatorHandlerIT ext
     {
         testAddComparatorToEnabledSchema();
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getComparatorContainer( "nis" );
+        Dn newdn = getComparatorContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -678,13 +678,13 @@ public class MetaComparatorHandlerIT ext
         testAddComparatorToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getComparatorContainer( "nis" );
+        Dn dn = getComparatorContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "comparator OID should NOT be present when added to disabled nis schema", schemaManager
             .getComparatorRegistry().contains( OID ) );
 
-        DN newdn = getComparatorContainer( "apachemeta" );
+        Dn newdn = getComparatorContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.StringComparator;
@@ -89,7 +89,7 @@ public class MetaMatchingRuleHandlerIT e
             "m-oid: " + OID,
             "m-description: A test comparator" );
 
-        DN dn = getComparatorContainer( "apachemeta" );
+        Dn dn = getComparatorContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Addition
@@ -118,7 +118,7 @@ public class MetaMatchingRuleHandlerIT e
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -148,7 +148,7 @@ public class MetaMatchingRuleHandlerIT e
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
 
-        DN dn = getMatchingRuleContainer( "nis" );
+        Dn dn = getMatchingRuleContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -171,7 +171,7 @@ public class MetaMatchingRuleHandlerIT e
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
 
-        DN dn = getMatchingRuleContainer( "notloaded" );
+        Dn dn = getMatchingRuleContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -196,7 +196,7 @@ public class MetaMatchingRuleHandlerIT e
     @Test
     public void testDeleteMatchingRuleFromEnabledSchema() throws Exception
     {
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToEnabledSchema();
 
@@ -225,7 +225,7 @@ public class MetaMatchingRuleHandlerIT e
     @Test
     public void testDeleteMatchingRuleFromDisabledSchema() throws Exception
     {
-        DN dn = getMatchingRuleContainer( "nis" );
+        Dn dn = getMatchingRuleContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToDisabledSchema();
 
@@ -254,7 +254,7 @@ public class MetaMatchingRuleHandlerIT e
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[2];
@@ -286,7 +286,7 @@ public class MetaMatchingRuleHandlerIT e
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -313,11 +313,11 @@ public class MetaMatchingRuleHandlerIT e
     @Ignore
     public void testRenameMatchingRule() throws Exception
     {
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToEnabledSchema();
 
-        DN newdn = getMatchingRuleContainer( "apachemeta" );
+        Dn newdn = getMatchingRuleContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -346,10 +346,10 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getMatchingRuleContainer( "apache" );
+        Dn newdn = getMatchingRuleContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -368,10 +368,10 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getMatchingRuleContainer( "apache" );
+        Dn newdn = getMatchingRuleContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -394,7 +394,7 @@ public class MetaMatchingRuleHandlerIT e
 
 //    public void testDeleteSyntaxWhenInUse() throws NamingException
 //    {
-//        DN dn = getSyntaxContainer( "apachemeta" );
+//        Dn dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );
 //        testAddSyntax();
 //        addDependeeMatchingRule();
@@ -419,10 +419,10 @@ public class MetaMatchingRuleHandlerIT e
 //        testAddSyntax();
 //        addDependeeMatchingRule();
 //
-//        DN dn = getSyntaxContainer( "apachemeta" );
+//        Dn dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );
 //
-//        DN newdn = getSyntaxContainer( "apache" );
+//        Dn newdn = getSyntaxContainer( "apache" );
 //        newdn = newdn.add( "m-oid" + "=" + OID );
 //
 //        try
@@ -445,10 +445,10 @@ public class MetaMatchingRuleHandlerIT e
 //        testAddSyntax();
 //        addDependeeMatchingRule()
 //
-//        DN dn = getSyntaxContainer( "apachemeta" );
+//        Dn dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );s
 //
-//        DN newdn = getSyntaxContainer( "apache" );
+//        Dn newdn = getSyntaxContainer( "apache" );
 //        newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 //
 //        try
@@ -477,12 +477,12 @@ public class MetaMatchingRuleHandlerIT e
 //
 //    public void testRenameNormalizerWhenInUse() throws NamingException
 //    {
-//        DN dn = getSyntaxContainer( "apachemeta" );
+//        Dn dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );
 //        testAddSyntax();
 //        addDependeeMatchingRule();
 //
-//        DN newdn = getSyntaxContainer( "apachemeta" );
+//        Dn newdn = getSyntaxContainer( "apachemeta" );
 //        newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 //
 //        try
@@ -511,10 +511,10 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top = top.add( "m-oid" + "=" + OID );
 
         try
@@ -538,10 +538,10 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -565,11 +565,11 @@ public class MetaMatchingRuleHandlerIT e
     {
         testAddMatchingRuleToEnabledSchema();
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getMatchingRuleContainer( "nis" );
+        Dn newdn = getMatchingRuleContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -586,16 +586,16 @@ public class MetaMatchingRuleHandlerIT e
         testAddMatchingRuleToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getMatchingRuleContainer( "nis" );
+        Dn dn = getMatchingRuleContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "matchingRule OID should NOT be present when added to disabled nis schema",
             schemaManager.getMatchingRuleRegistry().contains( OID ) );
 
-        DN newdn = getMatchingRuleContainer( "apachemeta" );
+        Dn newdn = getMatchingRuleContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
-        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName(newdn) );
 
         assertTrue( "matchingRule OID should be present when moved to enabled schema",
             schemaManager.getMatchingRuleRegistry().contains( OID ) );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
@@ -94,7 +94,7 @@ public class MetaNormalizerHandlerIT ext
             "m-oid", OID,
             "m-description: A test normalizer" );
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -118,7 +118,7 @@ public class MetaNormalizerHandlerIT ext
             "m-description: A test normalizer" );
 
         // nis is by default inactive
-        DN dn = getNormalizerContainer( "nis" );
+        Dn dn = getNormalizerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -140,7 +140,7 @@ public class MetaNormalizerHandlerIT ext
             "m-description: A test normalizer" );
 
         // nis is by default inactive
-        DN dn = getNormalizerContainer( "notloaded" );
+        Dn dn = getNormalizerContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -179,7 +179,7 @@ public class MetaNormalizerHandlerIT ext
             "m-oid", OID,
             "m-description: A test normalizer" );
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -211,7 +211,7 @@ public class MetaNormalizerHandlerIT ext
             "m-oid", OID,
             "m-description: A test normalizer" );
 
-        DN dn = getNormalizerContainer( "nis" );
+        Dn dn = getNormalizerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -223,7 +223,7 @@ public class MetaNormalizerHandlerIT ext
     @Test
     public void testDeleteNormalizerFromEnabledSchema() throws Exception
     {
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
 
@@ -252,7 +252,7 @@ public class MetaNormalizerHandlerIT ext
     @Test
     public void testDeleteNormalizerFromDisabledSchema() throws Exception
     {
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
 
@@ -282,13 +282,13 @@ public class MetaNormalizerHandlerIT ext
     @Ignore
     public void testRenameNormalizer() throws Exception
     {
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
 
-        DN newdn = getNormalizerContainer( "apachemeta" );
+        Dn newdn = getNormalizerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
-        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName(newdn) );
 
         assertFalse( "old normalizer OID should be removed from the registry after being renamed",
             schemaManager.getNormalizerRegistry().contains( OID ) );
@@ -315,10 +315,10 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getNormalizerContainer( "apache" );
+        Dn newdn = getNormalizerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -340,10 +340,10 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getNormalizerContainer( "apache" );
+        Dn newdn = getNormalizerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -368,7 +368,7 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[1];
@@ -393,7 +393,7 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -417,7 +417,7 @@ public class MetaNormalizerHandlerIT ext
     @Test
     public void testDeleteNormalizerWhenInUse() throws Exception
     {
-        DN nDn = getNormalizerContainer( "apachemeta" );
+        Dn nDn = getNormalizerContainer( "apachemeta" );
         nDn = nDn.add( "m-oid" + "=" + OID );
 
         // Create a new Normalizer
@@ -434,7 +434,7 @@ public class MetaNormalizerHandlerIT ext
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description: test" );
 
-        DN mrDn = getMatchingRuleContainer( "apachemeta" );
+        Dn mrDn = getMatchingRuleContainer( "apachemeta" );
         mrDn = mrDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -469,10 +469,10 @@ public class MetaNormalizerHandlerIT ext
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getNormalizerContainer( "apache" );
+        Dn newdn = getNormalizerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -498,10 +498,10 @@ public class MetaNormalizerHandlerIT ext
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getNormalizerContainer( "apache" );
+        Dn newdn = getNormalizerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -524,12 +524,12 @@ public class MetaNormalizerHandlerIT ext
     @Ignore
     public void testRenameNormalizerWhenInUse() throws Exception
     {
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        DN newdn = getNormalizerContainer( "apachemeta" );
+        Dn newdn = getNormalizerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -559,10 +559,10 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top = top.add( "m-oid" + "=" + OID );
 
         try
@@ -586,10 +586,10 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -613,11 +613,11 @@ public class MetaNormalizerHandlerIT ext
     {
         testAddNormalizerToEnabledSchema();
 
-        DN dn = getNormalizerContainer( "apachemeta" );
+        Dn dn = getNormalizerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getNormalizerContainer( "nis" );
+        Dn newdn = getNormalizerContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -634,13 +634,13 @@ public class MetaNormalizerHandlerIT ext
         testAddNormalizerToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getNormalizerContainer( "nis" );
+        Dn dn = getNormalizerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "normalizer OID should NOT be present when added to disabled nis schema",
             schemaManager.getNormalizerRegistry().contains( OID ) );
 
-        DN newdn = getNormalizerContainer( "apachemeta" );
+        Dn newdn = getNormalizerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.ObjectClass;
 import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
 import org.apache.directory.shared.ldap.util.JndiUtils;
@@ -78,7 +78,7 @@ public class MetaObjectClassHandlerIT ex
     }
 
 
-    private DN addObjectClass() throws Exception
+    private Dn addObjectClass() throws Exception
     {
         Attributes attrs = LdifUtils.createAttributes(
             "objectClass: top",
@@ -91,7 +91,7 @@ public class MetaObjectClassHandlerIT ex
             "m-must: cn",
             "m-may: ou" );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -105,7 +105,7 @@ public class MetaObjectClassHandlerIT ex
     @Test
     public void testAddObjectClassToEnabledSchema() throws Exception
     {
-        DN dn = addObjectClass();
+        Dn dn = addObjectClass();
 
         assertTrue( getObjectClassRegistry().contains( OID ) );
         assertEquals( getObjectClassRegistry().getSchemaName( OID ), "apachemeta" );
@@ -116,7 +116,7 @@ public class MetaObjectClassHandlerIT ex
     @Test
     public void testAddObjectClassToDisabledSchema() throws Exception
     {
-        DN dn = addObjectClassToDisabledSchema();
+        Dn dn = addObjectClassToDisabledSchema();
 
         assertFalse( "adding new objectClass to disabled schema should not register it into the registries",
             getObjectClassRegistry().contains( OID ) );
@@ -138,7 +138,7 @@ public class MetaObjectClassHandlerIT ex
             "m-must: cn",
             "m-may: ou" );
 
-        DN dn = getObjectClassContainer( "notloaded" );
+        Dn dn = getObjectClassContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -160,7 +160,7 @@ public class MetaObjectClassHandlerIT ex
     @Test
     public void testDeleteObjectClassFromEnabledSchema() throws Exception
     {
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         addObjectClass();
 
@@ -189,7 +189,7 @@ public class MetaObjectClassHandlerIT ex
     @Test
     public void testDeleteObjectClassFromDisabledSchema() throws Exception
     {
-        DN dn = getObjectClassContainer( "nis" );
+        Dn dn = getObjectClassContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         addObjectClassToDisabledSchema();
 
@@ -219,11 +219,11 @@ public class MetaObjectClassHandlerIT ex
     @Ignore
     public void testRenameObjectClassType() throws Exception
     {
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         addObjectClass();
 
-        DN newdn = getObjectClassContainer( "apachemeta" );
+        Dn newdn = getObjectClassContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -250,10 +250,10 @@ public class MetaObjectClassHandlerIT ex
     {
         addObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getObjectClassContainer( "apache" );
+        Dn newdn = getObjectClassContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -272,10 +272,10 @@ public class MetaObjectClassHandlerIT ex
     {
         addObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getObjectClassContainer( "apache" );
+        Dn newdn = getObjectClassContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -301,7 +301,7 @@ public class MetaObjectClassHandlerIT ex
         assertEquals( oc.getDescription(), DESCRIPTION0 );
         assertEquals( oc.getName(), NAME );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[2];
@@ -333,7 +333,7 @@ public class MetaObjectClassHandlerIT ex
         assertEquals( oc.getDescription(), DESCRIPTION0 );
         assertEquals( oc.getName(), NAME );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -371,7 +371,7 @@ public class MetaObjectClassHandlerIT ex
         attrs.put( "m-may", "ou" );
         attrs.put( "m-supObjectClass", OID );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + DEPENDEE_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -383,7 +383,7 @@ public class MetaObjectClassHandlerIT ex
     @Test
     public void testDeleteObjectClassWhenInUse() throws Exception
     {
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         addObjectClass();
         addDependeeObjectClass();
@@ -409,15 +409,15 @@ public class MetaObjectClassHandlerIT ex
         addObjectClass();
         addDependeeObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getObjectClassContainer( "apache" );
+        Dn newdn = getObjectClassContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
         {
-            getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+            getSchemaContext( service ).rename( JndiUtils.toName(dn), JndiUtils.toName( newdn ) );
             fail( "should not be able to move a objectClass in use" );
         }
         catch( OperationNotSupportedException e )
@@ -436,10 +436,10 @@ public class MetaObjectClassHandlerIT ex
         addObjectClass();
         addDependeeObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getObjectClassContainer( "apache" );
+        Dn newdn = getObjectClassContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -460,12 +460,12 @@ public class MetaObjectClassHandlerIT ex
     @Ignore
     public void testRenameObjectClassWhenInUse() throws Exception
     {
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         addObjectClass();
         addDependeeObjectClass();
 
-        DN newdn = getObjectClassContainer( "apachemeta" );
+        Dn newdn = getObjectClassContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -491,10 +491,10 @@ public class MetaObjectClassHandlerIT ex
     {
         addObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top.add( "m-oid" + "=" + OID );
 
         try
@@ -517,10 +517,10 @@ public class MetaObjectClassHandlerIT ex
     {
         addObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -537,7 +537,7 @@ public class MetaObjectClassHandlerIT ex
     }
 
 
-    private DN addObjectClassToDisabledSchema() throws Exception
+    private Dn addObjectClassToDisabledSchema() throws Exception
     {
         Attributes attrs = LdifUtils.createAttributes(
             "objectClass: top",
@@ -550,7 +550,7 @@ public class MetaObjectClassHandlerIT ex
             "m-must: cn",
             "m-may: ou" );
 
-        DN dn = getObjectClassContainer( "nis" );
+        Dn dn = getObjectClassContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -564,11 +564,11 @@ public class MetaObjectClassHandlerIT ex
     {
         addObjectClass();
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getObjectClassContainer( "nis" );
+        Dn newdn = getObjectClassContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -585,13 +585,13 @@ public class MetaObjectClassHandlerIT ex
         addObjectClassToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getObjectClassContainer( "nis" );
+        Dn dn = getObjectClassContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "objectClass OID should NOT be present when added to disabled nis schema",
             getObjectClassRegistry().contains( OID ) );
 
-        DN newdn = getObjectClassContainer( "apachemeta" );
+        Dn newdn = getObjectClassContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -626,7 +626,7 @@ public class MetaObjectClassHandlerIT ex
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -659,7 +659,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "javaSerializedObject");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -698,7 +698,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "person");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -733,7 +733,7 @@ public class MetaObjectClassHandlerIT ex
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -766,7 +766,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "javaNamingReference");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -799,7 +799,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "person");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -834,7 +834,7 @@ public class MetaObjectClassHandlerIT ex
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -867,7 +867,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "javaNamingReference");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -906,7 +906,7 @@ public class MetaObjectClassHandlerIT ex
         sup.add( "person");
         attrs.put( sup );
 
-        DN dn = getObjectClassContainer( "apachemeta" );
+        Dn dn = getObjectClassContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -394,7 +394,7 @@ public class MetaSchemaHandlerIT extends
     @Test
     public void testAddEnabledValidSchema() throws Exception
     {
-        DN dn = getSchemaContainer( "dummy" );
+        Dn dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -415,7 +415,7 @@ public class MetaSchemaHandlerIT extends
     @Test
     public void testAddEnabledSchemaWithExistingEnabledDeps() throws Exception
     {
-        DN dn = getSchemaContainer( "dummy" );
+        Dn dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -443,7 +443,7 @@ public class MetaSchemaHandlerIT extends
     @Test
     public void testAddEnabledSchemaWithExistingDisabledDeps() throws Exception
     {
-        DN dn = getSchemaContainer( "dummy" );
+        Dn dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -477,7 +477,7 @@ public class MetaSchemaHandlerIT extends
     @Test
     public void testAddEnabledSchemaWithNotExistingDeps() throws Exception
     {
-        DN dn = getSchemaContainer( "dummy" );
+        Dn dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -514,7 +514,7 @@ public class MetaSchemaHandlerIT extends
     @Test
     public void testDeleteEnabledValidSchema() throws Exception
     {
-        DN dn = getSchemaContainer( "dummy" );
+        Dn dn = getSchemaContainer( "dummy" );
         LdapContext schemaRoot = getSchemaContext( service );
         
         // Create a schema we will delete

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
@@ -88,7 +88,7 @@ public class MetaSyntaxCheckerHandlerIT 
             "objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID,
             "m-description: A test syntaxChecker" );
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -108,7 +108,7 @@ public class MetaSyntaxCheckerHandlerIT 
             "m-description: A test syntaxChecker" );
 
         // nis is by default inactive
-        DN dn = getSyntaxCheckerContainer( "nis" );
+        Dn dn = getSyntaxCheckerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -126,7 +126,7 @@ public class MetaSyntaxCheckerHandlerIT 
             "m-description: A test syntaxChecker" );
 
         // nis is by default inactive
-        DN dn = getSyntaxCheckerContainer( "notloaded" );
+        Dn dn = getSyntaxCheckerContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         try
@@ -161,7 +161,7 @@ public class MetaSyntaxCheckerHandlerIT 
             "org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker" );
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -189,7 +189,7 @@ public class MetaSyntaxCheckerHandlerIT 
             "org.apache.directory.shared.ldap.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker" );
 
-        DN dn = getSyntaxCheckerContainer( "nis" );
+        Dn dn = getSyntaxCheckerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -201,7 +201,7 @@ public class MetaSyntaxCheckerHandlerIT 
     @Test
     public void testDeleteSyntaxCheckerFromEnabledSchema() throws Exception
     {
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
 
@@ -230,7 +230,7 @@ public class MetaSyntaxCheckerHandlerIT 
     @Test
     public void testDeleteSyntaxCheckerFromDisabledSchema() throws Exception
     {
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
 
@@ -260,11 +260,11 @@ public class MetaSyntaxCheckerHandlerIT 
     @Ignore
     public void testRenameSyntaxChecker() throws Exception
     {
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn newdn = getSyntaxCheckerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -293,13 +293,13 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxCheckerContainer( "apache" );
+        Dn newdn = getSyntaxCheckerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
-        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+        getSchemaContext( service ).rename( JndiUtils.toName(dn), JndiUtils.toName( newdn ) );
 
         assertTrue( "syntaxChecker OID should still be present", schemaManager.getSyntaxCheckerRegistry()
             .contains( OID ) );
@@ -318,10 +318,10 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxCheckerContainer( "apache" );
+        Dn newdn = getSyntaxCheckerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -346,7 +346,7 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[1];
@@ -371,7 +371,7 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -395,7 +395,7 @@ public class MetaSyntaxCheckerHandlerIT 
     @Test
     public void testDeleteSyntaxCheckerWhenInUse() throws Exception
     {
-        DN scDn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn scDn = getSyntaxCheckerContainer( "apachemeta" );
         scDn = scDn.add( "m-oid" + "=" + OID );
 
         // Create a new SyntaxChecker
@@ -407,7 +407,7 @@ public class MetaSyntaxCheckerHandlerIT 
         Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
             "objectClass: metaSyntax", "m-oid", OID, "m-description: test" );
 
-        DN sDn = getSyntaxContainer( "apachemeta" );
+        Dn sDn = getSyntaxContainer( "apachemeta" );
         sDn = sDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -442,10 +442,10 @@ public class MetaSyntaxCheckerHandlerIT 
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxCheckerContainer( "apache" );
+        Dn newdn = getSyntaxCheckerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -471,10 +471,10 @@ public class MetaSyntaxCheckerHandlerIT 
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxCheckerContainer( "apache" );
+        Dn newdn = getSyntaxCheckerContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -497,12 +497,12 @@ public class MetaSyntaxCheckerHandlerIT 
     @Ignore
     public void testRenameSyntaxCheckerWhenInUse() throws Exception
     {
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
 
-        DN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn newdn = getSyntaxCheckerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -531,10 +531,10 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top.add( "m-oid" + "=" + OID );
 
         try
@@ -557,10 +557,10 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -583,11 +583,11 @@ public class MetaSyntaxCheckerHandlerIT 
     {
         testAddSyntaxCheckerToEnabledSchema();
 
-        DN dn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn dn = getSyntaxCheckerContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getSyntaxCheckerContainer( "nis" );
+        Dn newdn = getSyntaxCheckerContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -604,13 +604,13 @@ public class MetaSyntaxCheckerHandlerIT 
         testAddSyntaxCheckerToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getSyntaxCheckerContainer( "nis" );
+        Dn dn = getSyntaxCheckerContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "syntaxChecker OID should NOT be present when added to disabled nis schema", schemaManager
             .getSyntaxCheckerRegistry().contains( OID ) );
 
-        DN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        Dn newdn = getSyntaxCheckerContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Sun Jan 23 01:17:06 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
@@ -104,7 +104,7 @@ public class MetaSyntaxHandlerIT extends
             "m-oid", OID,
             "m-description", DESCRIPTION0 );
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         createDummySyntaxChecker( OID, "apachemeta" );
@@ -127,7 +127,7 @@ public class MetaSyntaxHandlerIT extends
             "m-description", DESCRIPTION0 );
 
         // nis is by default inactive
-        DN dn = getSyntaxContainer( "nis" );
+        Dn dn = getSyntaxContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         createDummySyntaxChecker( OID, "nis" );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
@@ -149,7 +149,7 @@ public class MetaSyntaxHandlerIT extends
             "m-description", DESCRIPTION0 );
 
         // nis is by default inactive
-        DN dn = getSyntaxContainer( "notloaded" );
+        Dn dn = getSyntaxContainer( "notloaded" );
         dn = dn.add( "m-oid" + "=" + OID );
         createDummySyntaxChecker( OID, "nis" );
 
@@ -172,7 +172,7 @@ public class MetaSyntaxHandlerIT extends
     @Test
     public void testDeleteSyntaxFromEnabledSchema() throws Exception
     {
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
 
@@ -201,7 +201,7 @@ public class MetaSyntaxHandlerIT extends
     @Test
     public void testDeleteSyntaxFromDisabledSchema() throws Exception
     {
-        DN dn = getSyntaxContainer( "nis" );
+        Dn dn = getSyntaxContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToDisabledSchema();
 
@@ -231,11 +231,11 @@ public class MetaSyntaxHandlerIT extends
     @Ignore
     public void testRenameSyntax() throws Exception
     {
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
 
-        DN newdn = getSyntaxContainer( "apachemeta" );
+        Dn newdn = getSyntaxContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
 
@@ -262,10 +262,10 @@ public class MetaSyntaxHandlerIT extends
     {
         testAddSyntaxToEnabledSchema();
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxContainer( "apache" );
+        Dn newdn = getSyntaxContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -284,10 +284,10 @@ public class MetaSyntaxHandlerIT extends
     {
         testAddSyntaxToEnabledSchema();
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxContainer( "apache" );
+        Dn newdn = getSyntaxContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -312,7 +312,7 @@ public class MetaSyntaxHandlerIT extends
         LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[1];
@@ -340,7 +340,7 @@ public class MetaSyntaxHandlerIT extends
         LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -366,7 +366,7 @@ public class MetaSyntaxHandlerIT extends
     @Test
     public void testDeleteSyntaxWhenInUse() throws Exception
     {
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
@@ -392,10 +392,10 @@ public class MetaSyntaxHandlerIT extends
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxContainer( "apache" );
+        Dn newdn = getSyntaxContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -420,10 +420,10 @@ public class MetaSyntaxHandlerIT extends
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = getSyntaxContainer( "apache" );
+        Dn newdn = getSyntaxContainer( "apache" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -451,7 +451,7 @@ public class MetaSyntaxHandlerIT extends
             "m-syntax", OID,
             "m-description", MR_DESCRIPTION );
 
-        DN dn = getMatchingRuleContainer( "apachemeta" );
+        Dn dn = getMatchingRuleContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + MR_OID );
         getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
 
@@ -464,12 +464,12 @@ public class MetaSyntaxHandlerIT extends
     @Ignore
     public void testRenameNormalizerWhenInUse() throws Exception
     {
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
 
-        DN newdn = getSyntaxContainer( "apachemeta" );
+        Dn newdn = getSyntaxContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -498,10 +498,10 @@ public class MetaSyntaxHandlerIT extends
     {
         testAddSyntaxToEnabledSchema();
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN top = new DN();
+        Dn top = new Dn();
         top.add( "m-oid" + "=" + OID );
 
         try
@@ -525,10 +525,10 @@ public class MetaSyntaxHandlerIT extends
     {
         testAddSyntaxToEnabledSchema();
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
-        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
+        Dn newdn = new Dn( "ou=comparators,cn=apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -552,11 +552,11 @@ public class MetaSyntaxHandlerIT extends
     {
         testAddSyntaxToEnabledSchema();
 
-        DN dn = getSyntaxContainer( "apachemeta" );
+        Dn dn = getSyntaxContainer( "apachemeta" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        DN newdn = getSyntaxContainer( "nis" );
+        Dn newdn = getSyntaxContainer( "nis" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
@@ -573,16 +573,16 @@ public class MetaSyntaxHandlerIT extends
         testAddSyntaxToDisabledSchema();
 
         // nis is inactive by default
-        DN dn = getSyntaxContainer( "nis" );
+        Dn dn = getSyntaxContainer( "nis" );
         dn = dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "syntax OID should NOT be present when added to disabled nis schema",
             schemaManager.getLdapSyntaxRegistry().contains( OID ) );
 
-        DN newdn = getSyntaxContainer( "apachemeta" );
+        Dn newdn = getSyntaxContainer( "apachemeta" );
         newdn = newdn.add( "m-oid" + "=" + OID );
 
-        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+        getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName(newdn) );
 
         assertTrue( "syntax OID should be present when moved to enabled schema",
             schemaManager.getLdapSyntaxRegistry().contains( OID ) );
@@ -603,7 +603,7 @@ public class MetaSyntaxHandlerIT extends
 
     private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
     {
-        DN dn = new DN( getSubschemaSubentryDN(), service.getSchemaManager() );
+        Dn dn = new Dn( getSubschemaSubentryDN(), service.getSchemaManager() );
         Attribute attr = new BasicAttribute( opAttr );
 
         for ( String description : descriptions )



Mime
View raw message