directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918771 [3/4] - in /directory/apacheds/trunk: core-entry/src/main/java/org/apache/directory/server/core/entry/ core-entry/src/test/java/org/apache/directory/server/core/entry/ core-integ/src/main/java/org/apache/directory/server/core/integ/...
Date Wed, 03 Mar 2010 23:29:20 GMT
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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -43,7 +43,7 @@
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SyntaxChecker;
@@ -91,7 +91,7 @@
             "m-oid", OID,
             "m-description: A test syntaxChecker" );
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -115,7 +115,7 @@
             "m-description: A test syntaxChecker" );
         
         // nis is by default inactive
-        LdapDN dn = getSyntaxCheckerContainer( "nis" );
+        DN dn = getSyntaxCheckerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -137,7 +137,7 @@
             "m-description: A test syntaxChecker" );
         
         // nis is by default inactive
-        LdapDN dn = getSyntaxCheckerContainer( "notloaded" );
+        DN dn = getSyntaxCheckerContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
 
         try
@@ -176,7 +176,7 @@
             "m-oid", OID,
             "m-description: A test syntaxChecker" );
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -208,7 +208,7 @@
             "m-oid", OID,
             "m-description: A test syntaxChecker" );
         
-        LdapDN dn = getSyntaxCheckerContainer( "nis" );
+        DN dn = getSyntaxCheckerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -220,7 +220,7 @@
     @Test
     public void testDeleteSyntaxCheckerFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
         
@@ -249,7 +249,7 @@
     @Test
     public void testDeleteSyntaxCheckerFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
         
@@ -279,11 +279,11 @@
     @Ignore
     public void testRenameSyntaxChecker() throws Exception
     {
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        DN newdn = getSyntaxCheckerContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -312,10 +312,10 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxCheckerContainer( "apache" );
+        DN newdn = getSyntaxCheckerContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -337,10 +337,10 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxCheckerContainer( "apache" );
+        DN newdn = getSyntaxCheckerContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -365,7 +365,7 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         ModificationItem[] mods = new ModificationItem[1];
@@ -390,7 +390,7 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -414,7 +414,7 @@
     @Test
     public void testDeleteSyntaxCheckerWhenInUse() throws Exception
     {
-        LdapDN scDn = getSyntaxCheckerContainer( "apachemeta" );
+        DN scDn = getSyntaxCheckerContainer( "apachemeta" );
         scDn.add( "m-oid" + "=" + OID );
         
         // Create a new SyntaxChecker
@@ -430,7 +430,7 @@
             "m-oid", OID,
             "m-description: test" );
 
-        LdapDN sDn = getSyntaxContainer( "apachemeta" );
+        DN sDn = getSyntaxContainer( "apachemeta" );
         sDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -466,10 +466,10 @@
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxCheckerContainer( "apache" );
+        DN newdn = getSyntaxCheckerContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -496,10 +496,10 @@
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxCheckerContainer( "apache" );
+        DN newdn = getSyntaxCheckerContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -523,12 +523,12 @@
     @Ignore
     public void testRenameSyntaxCheckerWhenInUse() throws Exception
     {
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxCheckerToEnabledSchema();
         schemaManager.getLdapSyntaxRegistry().register( new DummySyntax() );
         
-        LdapDN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        DN newdn = getSyntaxCheckerContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -559,10 +559,10 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
         
         try
@@ -586,10 +586,10 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = new LdapDN( "ou=comparators,cn=apachemeta" );
+        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -613,11 +613,11 @@
     {
         testAddSyntaxCheckerToEnabledSchema();
         
-        LdapDN dn = getSyntaxCheckerContainer( "apachemeta" );
+        DN dn = getSyntaxCheckerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getSyntaxCheckerContainer( "nis" );
+        DN newdn = getSyntaxCheckerContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -634,13 +634,13 @@
         testAddSyntaxCheckerToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN dn = getSyntaxCheckerContainer( "nis" );
+        DN dn = getSyntaxCheckerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "syntaxChecker OID should NOT be present when added to disabled nis schema", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
 
-        LdapDN newdn = getSyntaxCheckerContainer( "apachemeta" );
+        DN newdn = getSyntaxCheckerContainer( "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/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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -47,7 +47,7 @@
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
@@ -101,7 +101,7 @@
             "m-oid", OID,
             "m-description", DESCRIPTION0 );
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         createDummySyntaxChecker( OID, "apachemeta" );
         getSchemaContext( service ).createSubcontext( dn, attrs );
@@ -123,7 +123,7 @@
             "m-description", DESCRIPTION0 );
         
         // nis is by default inactive
-        LdapDN dn = getSyntaxContainer( "nis" );
+        DN dn = getSyntaxContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         createDummySyntaxChecker( OID, "nis" );
         getSchemaContext( service ).createSubcontext( dn, attrs );
@@ -145,7 +145,7 @@
             "m-description", DESCRIPTION0 );
         
         // nis is by default inactive
-        LdapDN dn = getSyntaxContainer( "notloaded" );
+        DN dn = getSyntaxContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
         createDummySyntaxChecker( OID, "nis" );
         
@@ -168,7 +168,7 @@
     @Test
     public void testDeleteSyntaxFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         
@@ -197,7 +197,7 @@
     @Test
     public void testDeleteSyntaxFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getSyntaxContainer( "nis" );
+        DN dn = getSyntaxContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToDisabledSchema();
 
@@ -227,11 +227,11 @@
     @Ignore
     public void testRenameSyntax() throws Exception
     {
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         
-        LdapDN newdn = getSyntaxContainer( "apachemeta" );
+        DN newdn = getSyntaxContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -258,10 +258,10 @@
     {
         testAddSyntaxToEnabledSchema();
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxContainer( "apache" );
+        DN newdn = getSyntaxContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -280,10 +280,10 @@
     {
         testAddSyntaxToEnabledSchema();
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxContainer( "apache" );
+        DN newdn = getSyntaxContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -308,7 +308,7 @@
         LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         ModificationItem[] mods = new ModificationItem[1];
@@ -336,7 +336,7 @@
         LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
         assertEquals( syntax.getDescription(), DESCRIPTION0 );
 
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -362,7 +362,7 @@
     @Test
     public void testDeleteSyntaxWhenInUse() throws Exception
     {
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
@@ -389,10 +389,10 @@
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxContainer( "apache" );
+        DN newdn = getSyntaxContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -417,10 +417,10 @@
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getSyntaxContainer( "apache" );
+        DN newdn = getSyntaxContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -448,7 +448,7 @@
             "m-syntax", OID,
             "m-description", MR_DESCRIPTION );
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + MR_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -461,12 +461,12 @@
     @Ignore
     public void testRenameNormalizerWhenInUse() throws Exception
     {
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddSyntaxToEnabledSchema();
         addDependeeMatchingRule( OID );
         
-        LdapDN newdn = getSyntaxContainer( "apachemeta" );
+        DN newdn = getSyntaxContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -495,10 +495,10 @@
     {
         testAddSyntaxToEnabledSchema();
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
         
         try
@@ -522,10 +522,10 @@
     {
         testAddSyntaxToEnabledSchema();
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = new LdapDN( "ou=comparators,cn=apachemeta" );
+        DN newdn = new DN( "ou=comparators,cn=apachemeta" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -549,11 +549,11 @@
     {
         testAddSyntaxToEnabledSchema();
         
-        LdapDN dn = getSyntaxContainer( "apachemeta" );
+        DN dn = getSyntaxContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getSyntaxContainer( "nis" );
+        DN newdn = getSyntaxContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -570,13 +570,13 @@
         testAddSyntaxToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN dn = getSyntaxContainer( "nis" );
+        DN dn = getSyntaxContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "syntax OID should NOT be present when added to disabled nis schema", 
             schemaManager.getLdapSyntaxRegistry().contains( OID ) );
 
-        LdapDN newdn = getSyntaxContainer( "apachemeta" );
+        DN newdn = getSyntaxContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -600,7 +600,7 @@
     
     private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
     {
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         dn.normalize( service.getSchemaManager().getNormalizerMapping() );
         Attribute attr = new BasicAttribute( opAttr );
         

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Wed Mar  3 23:29:19 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -101,7 +101,7 @@
         attributes.put( "m-description", "Account Status" );
         
         // Inject the AT
-        LdapDN dn = new LdapDN( "ou=attributeTypes,cn=apachemeta" );
+        DN dn = new DN( "ou=attributeTypes,cn=apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=2.16.840.1.113730.3.2.22.249" );
         
         getSchemaContext( service ).createSubcontext( dn, attributes );
@@ -139,7 +139,7 @@
         attributes.put( "m-may", "accountStatus" );
         
         // Inject the OC
-        dn = new LdapDN( "ou=objectClasses,cn=apachemeta" );
+        dn = new DN( "ou=objectClasses,cn=apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=2.16.840.1.113730.3.2.22" );
         
         getSchemaContext( service ).createSubcontext( dn, attributes );
@@ -152,9 +152,9 @@
      * @return the dn of the objectClass container
      * @throws NamingException on error
      */
-    private LdapDN getObjectClassContainer( String schemaName ) throws NamingException
+    private DN getObjectClassContainer( String schemaName ) throws NamingException
     {
-        return new LdapDN( "ou=objectClasses,cn=" + schemaName );
+        return new DN( "ou=objectClasses,cn=" + schemaName );
     }
 
 
@@ -178,7 +178,7 @@
         // This name is invalid
         attributes.put( "m-name", "http://example.com/users/accounts/L0" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + testOID );
         
         try
@@ -213,7 +213,7 @@
         // This name is invalid
         attributes.put( "m-name", "no-objectClasses" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( MetaSchemaConstants.M_OID_AT + "=" + testOID );
         
         try

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Wed Mar  3 23:29:19 2010
@@ -46,7 +46,7 @@
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
 import org.junit.Test;
@@ -137,7 +137,7 @@
 
     private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
     {
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         Attribute attr = new BasicAttribute( opAttr );
         
         for ( String description : descriptions )

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Wed Mar  3 23:29:19 2010
@@ -63,7 +63,7 @@
 import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
 import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -273,7 +273,7 @@
             assertNotNull( attrs );
             SchemaEntityFactory factory = new SchemaEntityFactory();
             
-            ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, LdapDN.EMPTY_LDAPDN, service.getSchemaManager() );
+            ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
 
             SyntaxChecker syntaxChecker = factory.getSyntaxChecker( schemaManager, serverEntry, service.getSchemaManager().getRegistries(), schemaName );
             assertEquals( oid, syntaxChecker.getOid() );
@@ -1401,7 +1401,7 @@
     public void testAddAttributeTypeOnDisabledSchema() throws Exception
     {
         disableSchema( "nis" );
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
             "DESC 'bogus description' SUP name SYNTAX '1.3.6.1.4.1.1466.115.121.1.15' SINGLE-VALUE X-SCHEMA 'nis' )";
         ModificationItem[] mods = new ModificationItem[1];
@@ -1431,7 +1431,7 @@
         assertNotNull( attrs );
         SchemaEntityFactory factory = new SchemaEntityFactory();
         
-        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, LdapDN.EMPTY_LDAPDN, service.getSchemaManager() );
+        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
         
         AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service.getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
@@ -1455,7 +1455,7 @@
     public void testAddAttributeTypeOnEnabledSchema() throws Exception
     {
         enableSchema( "nis" );
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
             "DESC 'bogus description' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
         ModificationItem[] mods = new ModificationItem[1];
@@ -1494,7 +1494,7 @@
         assertNotNull( attrs );
         SchemaEntityFactory factory = new SchemaEntityFactory();
         
-        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, LdapDN.EMPTY_LDAPDN, service.getSchemaManager() );
+        ServerEntry serverEntry = ServerEntryUtils.toServerEntry( attrs, DN.EMPTY_DN, service.getSchemaManager() );
 
         AttributeType at = factory.getAttributeType( service.getSchemaManager(), serverEntry, service.getSchemaManager().getRegistries(), "nis" );
         assertEquals( "1.3.6.1.4.1.18060.0.4.0.2.10000", at.getOid() );
@@ -1878,7 +1878,7 @@
         Attribute modifiersNameAttr = subentry.get( "modifiersName" );
         Attribute modifyTimestampAttr = subentry.get( "modifyTimestamp" );
         assertNotNull( modifiersNameAttr );
-        LdapDN expectedDN = new LdapDN( "uid=admin,ou=system" );
+        DN expectedDN = new DN( "uid=admin,ou=system" );
         expectedDN.normalize( service.getSchemaManager().getNormalizerMapping() );
         assertEquals( expectedDN.getNormName(), modifiersNameAttr.get() );
         assertNotNull( modifyTimestampAttr );
@@ -1893,7 +1893,7 @@
         // now update the schema information: add a new attribute type
         
         enableSchema( "nis" );
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         String substrate = "( 1.3.6.1.4.1.18060.0.4.0.2.10000 NAME ( 'bogus' 'bogusName' ) " +
             "DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
         ModificationItem[] mods = new ModificationItem[1];
@@ -1916,7 +1916,7 @@
         Attribute modifiersNameAttrAfter = subentry.get( "modifiersName" );
         Attribute modifiersTimestampAttrAfter = subentry.get( "modifyTimestamp" );
         assertNotNull( modifiersNameAttrAfter );
-        expectedDN = new LdapDN( "uid=admin,ou=system" );
+        expectedDN = new DN( "uid=admin,ou=system" );
         expectedDN.normalize( service.getSchemaManager().getNormalizerMapping() );
         assertEquals( expectedDN.getNormName(), modifiersNameAttrAfter.get() );
         assertNotNull( modifiersTimestampAttrAfter );
@@ -1969,7 +1969,7 @@
         modifiersNameAttrAfter = subentry.get( "modifiersName" );
         modifiersTimestampAttrAfter = subentry.get( "modifyTimestamp" );
         assertNotNull( modifiersNameAttrAfter );
-        expectedDN = new LdapDN( "cn=bogus user,ou=system" );
+        expectedDN = new DN( "cn=bogus user,ou=system" );
         expectedDN.normalize( service.getSchemaManager().getNormalizerMapping() );
         assertEquals( expectedDN.getNormName(), modifiersNameAttrAfter.get() );
         assertNotNull( modifiersTimestampAttrAfter );
@@ -1988,7 +1988,7 @@
     
     private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
     {
-        LdapDN dn = new LdapDN( getSubschemaSubentryDN() );
+        DN dn = new DN( getSubschemaSubentryDN() );
         
         // Uses ModificationItem to keep the modification ordering
         ModificationItem[] modifications = new ModificationItem[ descriptions.size()];

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java Wed Mar  3 23:29:19 2010
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,7 +51,7 @@
     public static void backupDeleted( CoreSession session, ClonedServerEntry deletedEntry ) throws Exception
     {
         LOG.info( "User \"" + session.getEffectivePrincipal() + "\" has deleted entry \"" + deletedEntry + "\"" );
-        LdapDN backupDn = new LdapDN ( "ou=backupContext,ou=system" );
+        DN backupDn = new DN ( "ou=backupContext,ou=system" );
         String deletedEntryRdn = deletedEntry.getDn().get( deletedEntry.getDn().size() - 1 );
         ServerEntry entry = ( ServerEntry ) deletedEntry.getOriginalEntry().clone();
         backupDn.add( deletedEntryRdn );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/ListUtilsSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/ListUtilsSP.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/ListUtilsSP.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/ListUtilsSP.java Wed Mar  3 23:29:19 2010
@@ -25,7 +25,7 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,7 +35,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( ListUtilsSP.class );
 
 
-    public static void subscribeToGroup( LdapDN addedEntryName, LdapContext groupCtx ) throws NamingException
+    public static void subscribeToGroup( DN addedEntryName, LdapContext groupCtx ) throws NamingException
     {
         LOG.info( "User \"" + addedEntryName + "\" will be subscribed to \"" + groupCtx + "\"" );
         groupCtx.modifyAttributes("", DirContext.ADD_ATTRIBUTE,

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Wed Mar  3 23:29:19 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -49,7 +49,7 @@
     public synchronized Context getInitialContext( Hashtable env ) throws NamingException
     {
         env = ( Hashtable<String, Object> ) env.clone();
-        LdapDN principalDn = new LdapDN( getPrincipal( env ) );
+        DN principalDn = new DN( getPrincipal( env ) );
         byte[] credential = getCredential( env );
         String authentication = getAuthentication( env );
         String providerUrl = getProviderUrl( env );
@@ -70,7 +70,7 @@
         try
         {
             CoreSession session = service.getSession( principalDn, credential );
-            ctx = new ServerLdapContext( service, session, new LdapDN( providerUrl ) );
+            ctx = new ServerLdapContext( service, session, new DN( providerUrl ) );
         }
         catch ( Exception e )
         {

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/LdapJndiProperties.java Wed Mar  3 23:29:19 2010
@@ -28,7 +28,7 @@
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -43,8 +43,8 @@
 {
     private static final String SASL_AUTHID = "java.naming.security.sasl.authorizationId";
 
-    private LdapDN providerDn;
-    private LdapDN bindDn;
+    private DN providerDn;
+    private DN bindDn;
     private String saslAuthId;
     private AuthenticationLevel level;
     private String saslMechanism;
@@ -129,11 +129,11 @@
 
         if ( url.trim().equals( "" ) )
         {
-            props.providerDn = LdapDN.EMPTY_LDAPDN;
+            props.providerDn = DN.EMPTY_DN;
         }
         else
         {
-            props.providerDn = new LdapDN( url );
+            props.providerDn = new DN( url );
         }
 
         // -------------------------------------------------------------------
@@ -192,7 +192,7 @@
         }
         else if ( principal == null && props.level == AuthenticationLevel.NONE )
         {
-            props.bindDn = LdapDN.EMPTY_LDAPDN;
+            props.bindDn = DN.EMPTY_DN;
         }
         else if ( !( principal instanceof String ) )
         {
@@ -200,11 +200,11 @@
         }
         else if ( ( ( String ) principal ).trim().equals( "" ) )
         {
-            props.bindDn = LdapDN.EMPTY_LDAPDN;
+            props.bindDn = DN.EMPTY_DN;
         }
         else
         {
-            props.bindDn = new LdapDN( ( String ) principal );
+            props.bindDn = new DN( ( String ) principal );
         }
         
 
@@ -250,13 +250,13 @@
     }
 
 
-    public LdapDN getBindDn()
+    public DN getBindDn()
     {
         return bindDn;
     }
 
 
-    public LdapDN getProviderDn()
+    public DN getProviderDn()
     {
         return providerDn;
     }

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Wed Mar  3 23:29:19 2010
@@ -87,7 +87,7 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -114,7 +114,7 @@
     private final Hashtable<String, Object> env;
 
     /** The distinguished name of this Context */
-    private final LdapDN dn;
+    private final DN dn;
 
     /** The set of registered NamingListeners */
     private final Map<NamingListener,DirectoryListener> listeners = 
@@ -190,7 +190,7 @@
     public ServerContext( DirectoryService service, LdapPrincipal principal, Name dn ) throws Exception
     {
         this.service = service;
-        this.dn = ( LdapDN ) dn.clone();
+        this.dn = ( DN ) dn.clone();
 
         this.env = new Hashtable<String, Object>();
         this.env.put( PROVIDER_URL, dn.toString() );
@@ -198,7 +198,7 @@
         session = new DefaultCoreSession( principal, service );
         OperationManager operationManager = service.getOperationManager();
         
-        if ( ! operationManager.hasEntry( new EntryOperationContext( session, ( LdapDN ) dn ) ) )
+        if ( ! operationManager.hasEntry( new EntryOperationContext( session, ( DN ) dn ) ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -208,14 +208,14 @@
     public ServerContext( DirectoryService service, CoreSession session, Name dn ) throws Exception
     {
         this.service = service;
-        this.dn = ( LdapDN ) dn.clone();
+        this.dn = ( DN ) dn.clone();
         this.env = new Hashtable<String, Object>();
         this.env.put( PROVIDER_URL, dn.toString() );
         this.env.put( DirectoryService.JNDI_KEY, service );
         this.session = session;
         OperationManager operationManager = service.getOperationManager();
         
-        if ( ! operationManager.hasEntry( new EntryOperationContext( session, ( LdapDN ) dn ) ) )
+        if ( ! operationManager.hasEntry( new EntryOperationContext( session, ( DN ) dn ) ) )
         {
             throw new NameNotFoundException( I18n.err( I18n.ERR_490, dn ) );
         }
@@ -257,7 +257,7 @@
      * @param entry
      * @param target
      */
-    protected void doAddOperation( LdapDN target, ServerEntry entry ) throws Exception
+    protected void doAddOperation( DN target, ServerEntry entry ) throws Exception
     {
         // setup the op context and populate with request controls
         AddOperationContext opCtx = new AddOperationContext( session, entry );
@@ -281,7 +281,7 @@
      * Used to encapsulate [de]marshalling of controls before and after delete operations.
      * @param target
      */
-    protected void doDeleteOperation( LdapDN target ) throws Exception
+    protected void doDeleteOperation( DN target ) throws Exception
     {
         // setup the op context and populate with request controls
         DeleteOperationContext opCtx = new DeleteOperationContext( session, target );
@@ -309,7 +309,7 @@
      * @param searchControls
      * @return NamingEnumeration
      */
-    protected EntryFilteringCursor doSearchOperation( LdapDN dn, AliasDerefMode aliasDerefMode,
+    protected EntryFilteringCursor doSearchOperation( DN dn, AliasDerefMode aliasDerefMode,
         ExprNode filter, SearchControls searchControls ) throws Exception
     {
         OperationManager operationManager = service.getOperationManager();
@@ -349,7 +349,7 @@
             
             if ( result )
             {
-                ServerEntry emptyEntry = new DefaultServerEntry( service.getSchemaManager(), LdapDN.EMPTY_LDAPDN ); 
+                ServerEntry emptyEntry = new DefaultServerEntry( service.getSchemaManager(), DN.EMPTY_DN ); 
                 return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( emptyEntry ), (SearchOperationContext)opContext );
             }
             else
@@ -385,7 +385,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after list operations.
      */
-    protected EntryFilteringCursor doListOperation( LdapDN target ) throws Exception
+    protected EntryFilteringCursor doListOperation( DN target ) throws Exception
     {
         // setup the op context and populate with request controls
         ListOperationContext opCtx = new ListOperationContext( session, target );
@@ -403,7 +403,7 @@
     }
 
 
-    protected ServerEntry doGetRootDSEOperation( LdapDN target ) throws Exception
+    protected ServerEntry doGetRootDSEOperation( DN target ) throws Exception
     {
         GetRootDSEOperationContext opCtx = new GetRootDSEOperationContext( session, target );
         opCtx.addRequestControls( JndiUtils.fromJndiControls( requestControls ) );
@@ -418,7 +418,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after lookup operations.
      */
-    protected ServerEntry doLookupOperation( LdapDN target ) throws Exception
+    protected ServerEntry doLookupOperation( DN target ) throws Exception
     {
         // setup the op context and populate with request controls
         LookupOperationContext opCtx;
@@ -439,7 +439,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after lookup operations.
      */
-    protected ServerEntry doLookupOperation( LdapDN target, String[] attrIds ) throws Exception
+    protected ServerEntry doLookupOperation( DN target, String[] attrIds ) throws Exception
     {
         // setup the op context and populate with request controls
         LookupOperationContext opCtx;
@@ -471,7 +471,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after bind operations.
      */
-    protected BindOperationContext doBindOperation( LdapDN bindDn, byte[] credentials, String saslMechanism, 
+    protected BindOperationContext doBindOperation( DN bindDn, byte[] credentials, String saslMechanism, 
         String saslAuthId ) throws Exception
     {
         // setup the op context and populate with request controls
@@ -496,7 +496,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after moveAndRename operations.
      */
-    protected void doMoveAndRenameOperation( LdapDN oldDn, LdapDN parent, RDN newRdn, boolean delOldDn )
+    protected void doMoveAndRenameOperation( DN oldDn, DN parent, RDN newRdn, boolean delOldDn )
         throws Exception
     {
         // setup the op context and populate with request controls
@@ -520,7 +520,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after modify operations.
      */
-    protected void doModifyOperation( LdapDN dn, List<Modification> modifications ) throws Exception
+    protected void doModifyOperation( DN dn, List<Modification> modifications ) throws Exception
     {
         // setup the op context and populate with request controls
         ModifyOperationContext opCtx = new ModifyOperationContext( session, dn, modifications );
@@ -542,7 +542,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after moveAndRename operations.
      */
-    protected void doMove( LdapDN oldDn, LdapDN target ) throws Exception
+    protected void doMove( DN oldDn, DN target ) throws Exception
     {
         // setup the op context and populate with request controls
         MoveOperationContext opCtx = new MoveOperationContext( session, oldDn, target );
@@ -564,7 +564,7 @@
     /**
      * Used to encapsulate [de]marshalling of controls before and after rename operations.
      */
-    protected void doRename( LdapDN oldDn, RDN newRdn, boolean delOldRdn ) throws Exception
+    protected void doRename( DN oldDn, RDN newRdn, boolean delOldRdn ) throws Exception
     {
         // setup the op context and populate with request controls
         RenameOperationContext opCtx = new RenameOperationContext( session, oldDn, newRdn, delOldRdn );
@@ -702,7 +702,7 @@
      */
     public Context createSubcontext( String name ) throws NamingException
     {
-        return createSubcontext( new LdapDN( name ) );
+        return createSubcontext( new DN( name ) );
     }
 
 
@@ -711,7 +711,7 @@
      */
     public Context createSubcontext( Name name ) throws NamingException
     {
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
         ServerEntry serverEntry = service.newEntry( target );
         serverEntry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, JavaLdapSupport.JCONTAINER_ATTR );
 
@@ -772,7 +772,7 @@
      */
     public void destroySubcontext( String name ) throws NamingException
     {
-        destroySubcontext( new LdapDN( name ) );
+        destroySubcontext( new DN( name ) );
     }
 
 
@@ -781,7 +781,7 @@
      */
     public void destroySubcontext( Name name ) throws NamingException
     {
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         if ( target.size() == 0 )
         {
@@ -804,11 +804,11 @@
      */
     public void bind( String name, Object obj ) throws NamingException
     {
-        bind( new LdapDN( name ), obj );
+        bind( new DN( name ), obj );
     }
 
 
-    private void injectRdnAttributeValues( LdapDN target, ServerEntry serverEntry ) throws NamingException
+    private void injectRdnAttributeValues( DN target, ServerEntry serverEntry ) throws NamingException
     {
         // Add all the RDN attributes and their values to this entry
         RDN rdn = target.getRdn( target.size() - 1 );
@@ -835,7 +835,7 @@
         // First, use state factories to do a transformation
         DirStateFactory.Result res = DirectoryManager.getStateToBind( obj, name, this, env, null );
 
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         // let's be sure that the Attributes is case insensitive
         ServerEntry outServerEntry = ServerEntryUtils.toServerEntry( AttributeUtils.toCaseInsensitive( res
@@ -939,7 +939,7 @@
      */
     public void rename( String oldName, String newName ) throws NamingException
     {
-        rename( new LdapDN( oldName ), new LdapDN( newName ) );
+        rename( new DN( oldName ), new DN( newName ) );
     }
 
 
@@ -948,8 +948,8 @@
      */
     public void rename( Name oldName, Name newName ) throws NamingException
     {
-        LdapDN oldDn = buildTarget( oldName );
-        LdapDN newDn = buildTarget( newName );
+        DN oldDn = buildTarget( oldName );
+        DN newDn = buildTarget( newName );
 
         if ( oldDn.size() == 0 )
         {
@@ -957,9 +957,9 @@
         }
 
         // calculate parents
-        LdapDN oldParent = (LdapDN)oldDn.clone();
+        DN oldParent = (DN)oldDn.clone();
         oldParent.remove( oldDn.size() - 1 );
-        LdapDN newParent = ( LdapDN ) newDn.clone();
+        DN newParent = ( DN ) newDn.clone();
         newParent.remove( newDn.size() - 1 );
 
         RDN oldRdn = oldDn.getRdn();
@@ -1029,7 +1029,7 @@
      */
     public void rebind( String name, Object obj ) throws NamingException
     {
-        rebind( new LdapDN( name ), obj );
+        rebind( new DN( name ), obj );
     }
 
 
@@ -1038,7 +1038,7 @@
      */
     public void rebind( Name name, Object obj ) throws NamingException
     {
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
         OperationManager operationManager = service.getOperationManager();
         
         try
@@ -1062,7 +1062,7 @@
      */
     public void unbind( String name ) throws NamingException
     {
-        unbind( new LdapDN( name ) );
+        unbind( new DN( name ) );
     }
 
 
@@ -1089,11 +1089,11 @@
     {
         if ( StringTools.isEmpty( name ) )
         {
-            return lookup( LdapDN.EMPTY_LDAPDN );
+            return lookup( DN.EMPTY_DN );
         }
         else
         {
-            return lookup( new LdapDN( name ) );
+            return lookup( new DN( name ) );
         }
     }
 
@@ -1104,7 +1104,7 @@
     public Object lookup( Name name ) throws NamingException
     {
         Object obj;
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         ServerEntry serverEntry = null;
 
@@ -1197,7 +1197,7 @@
         {
             public Name parse( String name ) throws NamingException
             {
-                return new LdapDN( name );
+                return new DN( name );
             }
         };
     }
@@ -1217,7 +1217,7 @@
         {
             public Name parse( String name ) throws NamingException
             {
-                return new LdapDN( name );
+                return new DN( name );
             }
         };
     }
@@ -1230,7 +1230,7 @@
         { "unchecked" })
     public NamingEnumeration list( String name ) throws NamingException
     {
-        return list( new LdapDN( name ) );
+        return list( new DN( name ) );
     }
 
 
@@ -1260,7 +1260,7 @@
         { "unchecked" })
     public NamingEnumeration listBindings( String name ) throws NamingException
     {
-        return listBindings( new LdapDN( name ) );
+        return listBindings( new DN( name ) );
     }
 
 
@@ -1272,7 +1272,7 @@
     public NamingEnumeration listBindings( Name name ) throws NamingException
     {
         // Conduct a special one level search at base for all objects
-        LdapDN base = buildTarget( name );
+        DN base = buildTarget( name );
         PresenceNode filter = new PresenceNode( SchemaConstants.OBJECT_CLASS_AT );
         SearchControls ctls = new SearchControls();
         ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1294,7 +1294,7 @@
      */
     public String composeName( String name, String prefix ) throws NamingException
     {
-        return composeName( new LdapDN( name ), new LdapDN( prefix ) ).toString();
+        return composeName( new DN( name ), new DN( prefix ) ).toString();
     }
 
 
@@ -1378,7 +1378,7 @@
 
     public void addNamingListener( String name, int scope, NamingListener namingListener ) throws NamingException
     {
-        addNamingListener( new LdapDN( name ), scope, namingListener );
+        addNamingListener( new DN( name ), scope, namingListener );
     }
 
 
@@ -1430,9 +1430,9 @@
      * @throws InvalidNameException if relativeName is not a valid name in
      *      the LDAP namespace.
      */
-    LdapDN buildTarget( Name relativeName ) throws InvalidNameException
+    DN buildTarget( Name relativeName ) throws InvalidNameException
     {
-        LdapDN target = ( LdapDN ) dn.clone();
+        DN target = ( DN ) dn.clone();
 
         // Add to left hand side of cloned DN the relative name arg
         target.addAllNormalized( target.size(), relativeName );

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Wed Mar  3 23:29:19 2010
@@ -70,7 +70,7 @@
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.name.AVA;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.util.AttributeUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -120,7 +120,7 @@
     // ------------------------------------------------------------------------
 
     
-    public ServerDirContext( DirectoryService service, CoreSession session, LdapDN bindDn ) throws Exception
+    public ServerDirContext( DirectoryService service, CoreSession session, DN bindDn ) throws Exception
     {
         super( service, session, bindDn );
     }
@@ -131,7 +131,7 @@
      */
     public Attributes getAttributes( String name ) throws NamingException
     {
-        return getAttributes( new LdapDN( name ) );
+        return getAttributes( new DN( name ) );
     }
 
 
@@ -161,7 +161,7 @@
      */
     public Attributes getAttributes( String name, String[] attrIds ) throws NamingException
     {
-        return getAttributes( new LdapDN( name ), attrIds );
+        return getAttributes( new DN( name ), attrIds );
     }
 
 
@@ -191,7 +191,7 @@
      */
     public void modifyAttributes( String name, int modOp, Attributes attrs ) throws NamingException
     {
-        modifyAttributes( new LdapDN( name ), modOp, AttributeUtils.toCaseInsensitive( attrs ) );
+        modifyAttributes( new DN( name ), modOp, AttributeUtils.toCaseInsensitive( attrs ) );
     }
 
 
@@ -220,13 +220,13 @@
 
         try
         {
-            if ( name instanceof LdapDN )
+            if ( name instanceof DN )
             {
                 doModifyOperation( buildTarget( name ), newMods );
             }
             else
             {
-                doModifyOperation( buildTarget( new LdapDN( name ) ), newMods );
+                doModifyOperation( buildTarget( new DN( name ) ), newMods );
             }
         }
         catch( Exception e )
@@ -242,7 +242,7 @@
      */
     public void modifyAttributes( String name, ModificationItem[] mods ) throws NamingException
     {
-        modifyAttributes( new LdapDN( name ), mods );
+        modifyAttributes( new DN( name ), mods );
     }
 
 
@@ -256,7 +256,7 @@
             .toServerModification( mods, getDirectoryService().getSchemaManager() );
         try
         {
-            doModifyOperation( buildTarget( new LdapDN( name ) ), newMods );
+            doModifyOperation( buildTarget( new DN( name ) ), newMods );
         }
         catch ( Exception e )
         {
@@ -276,7 +276,7 @@
                 getDirectoryService().getSchemaManager() );
         try
         {
-            doModifyOperation( buildTarget( new LdapDN( name ) ), newMods );
+            doModifyOperation( buildTarget( new DN( name ) ), newMods );
         }
         catch ( Exception e )
         {
@@ -291,7 +291,7 @@
      */
     public void bind( String name, Object obj, Attributes attrs ) throws NamingException
     {
-        bind( new LdapDN( name ), obj, AttributeUtils.toCaseInsensitive( attrs ) );
+        bind( new DN( name ), obj, AttributeUtils.toCaseInsensitive( attrs ) );
     }
 
 
@@ -313,7 +313,7 @@
             return;
         }
 
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         ServerEntry serverEntry = ServerEntryUtils.toServerEntry( AttributeUtils.toCaseInsensitive( attrs ), target,
             getDirectoryService().getSchemaManager() );
@@ -436,7 +436,7 @@
      */
     public void rebind( String name, Object obj, Attributes attrs ) throws NamingException
     {
-        rebind( new LdapDN( name ), obj, AttributeUtils.toCaseInsensitive( attrs ) );
+        rebind( new DN( name ), obj, AttributeUtils.toCaseInsensitive( attrs ) );
     }
 
 
@@ -446,7 +446,7 @@
      */
     public void rebind( Name name, Object obj, Attributes attrs ) throws NamingException
     {
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         try
         {
@@ -470,7 +470,7 @@
      */
     public DirContext createSubcontext( String name, Attributes attrs ) throws NamingException
     {
-        LdapDN dn = new LdapDN( name );
+        DN dn = new DN( name );
         Attributes attributes = AttributeUtils.toCaseInsensitive( attrs );
         return createSubcontext( dn, attributes );
     }
@@ -487,7 +487,7 @@
             return ( DirContext ) super.createSubcontext( name );
         }
 
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
         RDN rdn = target.getRdn( target.size() - 1 );
 
         attrs = AttributeUtils.toCaseInsensitive( attrs );
@@ -605,7 +605,7 @@
      */
     public NamingEnumeration<SearchResult> search( String name, Attributes matchingAttributes ) throws NamingException
     {
-        return search( new LdapDN( name ), matchingAttributes, null );
+        return search( new DN( name ), matchingAttributes, null );
     }
 
 
@@ -626,7 +626,7 @@
     public NamingEnumeration<SearchResult> search( String name, Attributes matchingAttributes,
         String[] attributesToReturn ) throws NamingException
     {
-        return search( new LdapDN( name ), AttributeUtils.toCaseInsensitive( matchingAttributes ), attributesToReturn );
+        return search( new DN( name ), AttributeUtils.toCaseInsensitive( matchingAttributes ), attributesToReturn );
     }
 
 
@@ -638,7 +638,7 @@
         throws NamingException
     {
         SearchControls ctls = new SearchControls();
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         // If we need to return specific attributes add em to the SearchControls
         if ( null != attributesToReturn )
@@ -762,7 +762,7 @@
     public NamingEnumeration<SearchResult> search( String name, String filter, SearchControls cons )
         throws NamingException
     {
-        return search( new LdapDN( name ), filter, cons );
+        return search( new DN( name ), filter, cons );
     }
 
 
@@ -780,7 +780,7 @@
     public NamingEnumeration<SearchResult> search( Name name, ExprNode filter, SearchControls cons )
         throws NamingException
     {
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
         AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
         try
         {
@@ -802,7 +802,7 @@
         throws NamingException
     {
         ExprNode filterNode;
-        LdapDN target = buildTarget( name );
+        DN target = buildTarget( name );
 
         try
         {
@@ -837,7 +837,7 @@
     public NamingEnumeration<SearchResult> search( String name, String filterExpr, Object[] filterArgs,
         SearchControls cons ) throws NamingException
     {
-        return search( new LdapDN( name ), filterExpr, filterArgs, cons );
+        return search( new DN( name ), filterExpr, filterArgs, cons );
     }
 
 
@@ -953,7 +953,7 @@
     public void addNamingListener( String name, String filter, SearchControls searchControls,
         NamingListener namingListener ) throws NamingException
     {
-        addNamingListener( new LdapDN( name ), filter, searchControls, namingListener );
+        addNamingListener( new DN( name ), filter, searchControls, namingListener );
     }
 
 
@@ -995,6 +995,6 @@
     public void addNamingListener( String name, String filter, Object[] objects, SearchControls searchControls,
         NamingListener namingListener ) throws NamingException
     {
-        addNamingListener( new LdapDN( name ), filter, objects, searchControls, namingListener );
+        addNamingListener( new DN( name ), filter, objects, searchControls, namingListener );
     }
 }

Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Wed Mar  3 23:29:19 2010
@@ -39,7 +39,7 @@
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.jndi.JndiUtils;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -74,13 +74,13 @@
      * @param service the directory service core
      * @throws NamingException if there are problems instantiating 
      */
-    public ServerLdapContext( DirectoryService service, LdapPrincipal principal, LdapDN dn ) throws Exception
+    public ServerLdapContext( DirectoryService service, LdapPrincipal principal, DN dn ) throws Exception
     {
         super( service, principal, dn );
     }
 
 
-    public ServerLdapContext( DirectoryService service, CoreSession session, LdapDN bindDn ) throws Exception
+    public ServerLdapContext( DirectoryService service, CoreSession session, DN bindDn ) throws Exception
     {
         super( service, session, bindDn );
     }
@@ -105,7 +105,7 @@
         ServerLdapContext ctx = null;
         try
         {
-            ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), ( LdapDN ) getDn() );
+            ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), ( DN ) getDn() );
         }
         catch ( Exception e )
         {
@@ -179,7 +179,7 @@
      * permission is not allowed for this operation or the oid is not recognized,
      * or the attribute is not present in the entry ... you get the picture.
      */
-    public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
+    public boolean compare( DN name, String oid, Object value ) throws NamingException
     {
         Value<?> val = null;
         
@@ -275,7 +275,7 @@
         
         try
         {
-            ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), new LdapDN() );
+            ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), new DN() );
         }
         catch ( Exception e )
         {

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

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockDirectoryService.java Wed Mar  3 23:29:19 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.server.core.schema.SchemaService;
 import org.apache.directory.shared.ldap.csn.Csn;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -339,7 +339,7 @@
     }
 
 
-    public ServerEntry newEntry( LdapDN dn ) throws NamingException
+    public ServerEntry newEntry( DN dn ) throws NamingException
     {
         return null;
     }
@@ -368,13 +368,13 @@
     }
 
 
-    public CoreSession getSession( LdapDN principalDn, byte[] credentials ) throws Exception
+    public CoreSession getSession( DN principalDn, byte[] credentials ) throws Exception
     {
         return null;
     }
 
     
-    public CoreSession getSession( LdapDN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
+    public CoreSession getSession( DN principalDn, byte[] credentials, String saslMechanism, String saslAuthId )
         throws Exception
     {
         return null;

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

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java Wed Mar  3 23:29:19 2010
@@ -34,7 +34,7 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 public class MockOperation implements OperationContext
 {
@@ -45,7 +45,7 @@
     public MockOperation( int count ) throws Exception 
     {
         this.count = count;
-        this.session = new MockCoreSession( new LdapPrincipal( new LdapDN(), AuthenticationLevel.STRONG ), 
+        this.session = new MockCoreSession( new LdapPrincipal( new DN(), AuthenticationLevel.STRONG ), 
             new MockDirectoryService( count ) );
     }
 
@@ -84,7 +84,7 @@
     }
 
 
-    public LdapDN getDn()
+    public DN getDn()
     {
         return null;
     }
@@ -168,7 +168,7 @@
     }
 
 
-    public ClonedServerEntry lookup( LdapDN dn, Collection<String> bypass ) throws Exception
+    public ClonedServerEntry lookup( DN dn, Collection<String> bypass ) throws Exception
     {
         return null;
     }
@@ -180,7 +180,7 @@
     }
 
 
-    public LookupOperationContext newLookupContext( LdapDN dn )
+    public LookupOperationContext newLookupContext( DN dn )
     {
         return null;
     }
@@ -196,7 +196,7 @@
     }
 
 
-    public void setDn( LdapDN dn )
+    public void setDn( DN dn )
     {
     }
 
@@ -242,17 +242,17 @@
     }
 
 
-    public void delete( LdapDN dn, Collection<String> bypass ) throws Exception
+    public void delete( DN dn, Collection<String> bypass ) throws Exception
     {
     }
 
 
-    public void modify( LdapDN dn, List<Modification> mods, Collection<String> bypass ) throws Exception
+    public void modify( DN dn, List<Modification> mods, Collection<String> bypass ) throws Exception
     {
     }
 
 
-    public boolean hasEntry( LdapDN dn, Collection<String> byPass ) throws Exception
+    public boolean hasEntry( DN dn, Collection<String> byPass ) throws Exception
     {
         return false;
     }

Modified: directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java (original)
+++ directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperationManager.java Wed Mar  3 23:29:19 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 public class MockOperationManager implements OperationManager
 {
@@ -72,7 +72,7 @@
     {
     }
 
-    public LdapDN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
+    public DN getMatchedName( GetMatchedNameOperationContext opContext ) throws Exception
     {
         return null;
     }
@@ -82,7 +82,7 @@
         return null;
     }
 
-    public LdapDN getSuffix( GetSuffixOperationContext opContext ) throws Exception
+    public DN getSuffix( GetSuffixOperationContext opContext ) throws Exception
     {
         return null;
     }



Mime
View raw message