directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918771 [2/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/jndi/referral/DeleteReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Wed Mar  3 23:29:19 2010
@@ -41,7 +41,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 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.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -118,7 +118,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -187,7 +187,7 @@
         
         try
         {
-            session.delete( new LdapDN( "cn=Emmanuel Lecharny,ou=Roles" ) );
+            session.delete( new DN( "cn=Emmanuel Lecharny,ou=Roles" ) );
             fail();
         }
         catch ( NameNotFoundException nnfe )
@@ -204,7 +204,7 @@
     public void testDeleteExistingEntryNotReferral() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Alex Karasulu,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "cn=Alex Karasulu,o=MNN,c=WW,ou=system" );
         
         session.delete( dn );
         
@@ -269,7 +269,7 @@
 
         MNNCtx.destroySubcontext( "ou=Roles" );
 
-        LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
         
         // We should not find the entry
         try
@@ -292,7 +292,7 @@
     public void testDeleteExistingEntryReferralCoreAPINoManageDSAIt() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
 
         try
         {
@@ -327,7 +327,7 @@
     public void testDeleteExistingEntryReferralCoreAPIManageDSAIT() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
 
         session.delete( dn, true );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Wed Mar  3 23:29:19 2010
@@ -53,7 +53,7 @@
 import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -130,7 +130,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -245,7 +245,7 @@
             
             mods.add( mod );
             
-            session.modify( new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods );
+            session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods );
             fail();
         }
         catch ( NameNotFoundException nnfe )
@@ -273,7 +273,7 @@
             
             mods.add( mod );
             
-            session.modify( new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods, true );
+            session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods, true );
             fail();
         }
         catch ( NameNotFoundException nnfe )
@@ -381,7 +381,7 @@
             
             mods.add( mod );
             
-            session.modify( new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, false );
+            session.modify( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, false );
             fail();
         }
         catch ( ReferralException re )
@@ -420,7 +420,7 @@
         
         mods.add( mod );
         
-        session.modify( new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, true );
+        session.modify( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, true );
         
         // Now try to retrieve this attribute
         Attributes result = MNNCtx.getAttributes( "ou=Roles", new String[]{ "description" } );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Wed Mar  3 23:29:19 2010
@@ -47,7 +47,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.junit.Before;
 import org.junit.Test;
@@ -149,7 +149,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -237,8 +237,8 @@
     public void testMoveAndRenameEntrySuperiorHasReferralAncestorCoreAPIWithoutManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "o=PNN,c=WW,ou=system" );
         RDN newRdn = new RDN( "cn=Alex" );
         
         try
@@ -274,8 +274,8 @@
     public void testMoveAndRenameSuperiorHasReferralAncestorCoreAPIWithManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" ); 
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "o=PNN,c=WW,ou=system" ); 
         RDN newRdn = new RDN( "cn=Alex" );
         
         try
@@ -425,8 +425,8 @@
     public void testMoveAndRenameIsReferralCoreAPIWithoutManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "o=PNN,c=WW,ou=system" );
         RDN newRdn = new RDN( "cn=Alex" );
         
         try
@@ -462,8 +462,8 @@
     public void testMoveAndRenameIsReferralCoreAPIWithManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "o=PNN,c=WW,ou=system" ); 
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "o=PNN,c=WW,ou=system" ); 
         RDN newRdn = new RDN( "cn=Alex" );
         
         try

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Wed Mar  3 23:29:19 2010
@@ -46,7 +46,7 @@
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 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.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -140,7 +140,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -229,8 +229,8 @@
     public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" ); 
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" ); 
         
         try
         {
@@ -265,8 +265,8 @@
     public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithManageDsaIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN newParent = new LdapDN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" ); 
+        DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+        DN newParent = new DN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" ); 
         
         try
         {
@@ -422,8 +422,8 @@
     public void testMoveEntryWithReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN orig = new LdapDN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
-        LdapDN dest = new LdapDN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
+        DN orig = new DN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
+        DN dest = new DN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
         
         try
         {
@@ -458,8 +458,8 @@
     public void testMoveEntryWithReferralAncestorCoreAPIWithManageDsaIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN orig = new LdapDN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
-        LdapDN dest = new LdapDN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
+        DN orig = new DN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
+        DN dest = new DN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
         
         try
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Wed Mar  3 23:29:19 2010
@@ -44,7 +44,7 @@
 import org.apache.directory.server.core.entry.ServerEntry;
 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.name.RDN;
 import org.junit.Before;
 import org.junit.Test;
@@ -137,7 +137,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -229,7 +229,7 @@
 
         try
         {
-            LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
+            DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
             RDN newRdn = new RDN( "cn=Alex Karasulu" );
             session.rename( dn, newRdn, false, false );
             fail();
@@ -264,7 +264,7 @@
         CoreSession session = service.getAdminSession();
         try
         {
-            LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
+            DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
             RDN newRdn = new RDN( "cn=Alex Karasulu" );
             session.rename( dn, newRdn, false, true );
             fail();
@@ -404,7 +404,7 @@
 
         try
         {
-            LdapDN dn = new LdapDN( "ou=roles,o=MNN,c=WW,ou=system" );
+            DN dn = new DN( "ou=roles,o=MNN,c=WW,ou=system" );
             RDN newRdn = new RDN( "cn=Alex Karasulu" );
             session.rename( dn, newRdn, false, false );
             fail();
@@ -437,8 +437,8 @@
     public void testRenameExistingReferralCoreAPIWithManageDsaIt() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dnRoles = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
-        LdapDN dnGroups = new LdapDN( "ou=Groups,o=MNN,c=WW,ou=system" );
+        DN dnRoles = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dnGroups = new DN( "ou=Groups,o=MNN,c=WW,ou=system" );
         RDN newRdn = new RDN( "ou=Groups" );
 
         // First check that the object exists
@@ -555,7 +555,7 @@
     public void testRenameRdnExistIsReferralCoreAPIWithoutManageDsaIt() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
         RDN newRdn = new RDN( "ou=People" );
 
         try
@@ -591,7 +591,7 @@
     public void testRenameRdnExistIsReferralCoreAPIWithManageDsaIt() throws Exception
     {
         CoreSession session = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=Roles,o=MNN,c=WW,ou=system" );
+        DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
         RDN newRdn = new RDN( "ou=People" );
 
         try

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Wed Mar  3 23:29:19 2010
@@ -48,7 +48,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -138,7 +138,7 @@
         userEntry.put( "cn", "Emmanuel Lecharny" );
         
         // Core API entry
-        LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+        DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
         serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
@@ -233,7 +233,7 @@
     public void testSearchWithReferralAncestorCoreAPIWithoutManageDSAIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
+        DN dn = new DN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
         {
@@ -268,7 +268,7 @@
     public void testSearchWithReferralAncestorCoreAPIWithManageDSAIt() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
+        DN dn = new DN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
         {
@@ -385,7 +385,7 @@
     public void testSearchExistingReferralCoreAPIWithoutManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=roles,o=Mnn,c=WW,ou=system" );
+        DN dn = new DN( "ou=roles,o=Mnn,c=WW,ou=system" );
         
         try
         {
@@ -419,7 +419,7 @@
     public void testSearchExistingReferralCoreAPIWithManageDsaIT() throws Exception
     {
         CoreSession coreSession = service.getAdminSession();
-        LdapDN dn = new LdapDN( "ou=roles,o=Mnn,c=WW,ou=system" );
+        DN dn = new DN( "ou=roles,o=Mnn,c=WW,ou=system" );
         
         EntryFilteringCursor cursor = coreSession.search( dn, "(ObjectClass=*)", true );
         

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java Wed Mar  3 23:29:19 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
-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;
 
@@ -55,7 +55,7 @@
     @Test
     public void testLookupStar() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=test,ou=system" );
+        DN dn = new DN( "cn=test,ou=system" );
         Entry entry = service.getAdminSession().lookup( dn, new String[]{ "*" } );
         
         assertNotNull( entry );
@@ -78,7 +78,7 @@
     public void testLookupPlus() throws Exception
     {
         service.setDenormalizeOpAttrsEnabled( true );
-        LdapDN dn = new LdapDN( "cn=test,ou=system" );
+        DN dn = new DN( "cn=test,ou=system" );
         Entry entry = service.getAdminSession().lookup( dn, new String[]{ "+" } );
         
         assertNotNull( entry );
@@ -105,7 +105,7 @@
     @Test
     public void testLookupEmptyAtrid() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=test,ou=system" );
+        DN dn = new DN( "cn=test,ou=system" );
         Entry entry = service.getAdminSession().lookup( dn, new String[]{} );
         
         assertNotNull( entry );
@@ -126,7 +126,7 @@
     @Test
     public void testLookup() throws Exception
     {
-        LdapDN dn = new LdapDN( "cn=test,ou=system" );
+        DN dn = new DN( "cn=test,ou=system" );
         Entry entry = service.getAdminSession().lookup( dn );
         
         assertNotNull( entry );

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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -23,7 +23,7 @@
 import java.util.Enumeration;
 
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
-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.StringTools;
 import org.junit.Before;
@@ -50,7 +50,7 @@
      *
      * @param dn the SchemaObject DN
      */
-    protected String getSchemaPath( LdapDN dn )
+    protected String getSchemaPath( DN dn )
     {
         StringBuilder sb = new StringBuilder();
         
@@ -76,7 +76,7 @@
      *
      * @param dn The SchemaObject DN
      */
-    protected boolean isOnDisk( LdapDN dn )
+    protected boolean isOnDisk( DN dn )
     {
         // donot change the value of getSchemaPath to lowercase
         // on Linux this gives a wrong path
@@ -95,9 +95,9 @@
      * @return the dn of the a schema entity container
      * @throws Exception on failure
      */
-    protected LdapDN getSchemaContainer( String schemaName ) throws Exception
+    protected DN getSchemaContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "cn=" + schemaName );
+        return new DN( "cn=" + schemaName );
     }
     
     
@@ -108,9 +108,9 @@
      * @return the dn of the a schema's attributeType entity container
      * @throws Exception on failure
      */
-    protected LdapDN getAttributeTypeContainer( String schemaName ) throws Exception
+    protected DN getAttributeTypeContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=attributeTypes,cn=" + schemaName );
+        return new DN( "ou=attributeTypes,cn=" + schemaName );
     }
 
 
@@ -121,9 +121,9 @@
      * @return the dn to the ou under which comparators are found for a schema
      * @throws Exception if there are dn construction issues
      */
-    protected LdapDN getComparatorContainer( String schemaName ) throws Exception
+    protected DN getComparatorContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=comparators,cn=" + schemaName );
+        return new DN( "ou=comparators,cn=" + schemaName );
     }
 
     
@@ -134,9 +134,9 @@
      * @return the dn to the ou under which MatchingRules are found for a schema
      * @throws Exception if there are dn construction issues
      */
-    protected LdapDN getMatchingRuleContainer( String schemaName ) throws Exception
+    protected DN getMatchingRuleContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=matchingRules,cn=" + schemaName );
+        return new DN( "ou=matchingRules,cn=" + schemaName );
     }
     
    
@@ -147,9 +147,9 @@
      * @return the dn of the container which contains objectClasses
      * @throws Exception on error
      */
-    protected LdapDN getObjectClassContainer( String schemaName ) throws Exception
+    protected DN getObjectClassContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=objectClasses,cn=" + schemaName );
+        return new DN( "ou=objectClasses,cn=" + schemaName );
     }
 
 
@@ -161,9 +161,9 @@
      * @return  the name of the container with normalizer entries in it
      * @throws Exception on error
      */
-    protected LdapDN getNormalizerContainer( String schemaName ) throws Exception
+    protected DN getNormalizerContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=normalizers,cn=" + schemaName );
+        return new DN( "ou=normalizers,cn=" + schemaName );
     }
 
 
@@ -174,9 +174,9 @@
      * @return the dn of the container holding syntaxes for the schema
      * @throws Exception on dn parse errors
      */
-    protected LdapDN getSyntaxContainer( String schemaName ) throws Exception
+    protected DN getSyntaxContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "ou=syntaxes,cn=" + schemaName );
+        return new DN( "ou=syntaxes,cn=" + schemaName );
     }
     
     
@@ -187,8 +187,8 @@
      * @return the dn of the container holding syntax checkers for the schema
      * @throws Exception on dn parse errors
      */
-    protected LdapDN getSyntaxCheckerContainer( String schemaName ) throws Exception
+    protected DN getSyntaxCheckerContainer( String schemaName ) throws Exception
     {
-        return new LdapDN( "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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -42,7 +42,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.AttributeType;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -85,7 +85,7 @@
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         
         // Pre-checks
@@ -116,7 +116,7 @@
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
 
-        LdapDN dn = getAttributeTypeContainer( "notloaded" );
+        DN dn = getAttributeTypeContainer( "notloaded" );
         dn.add( "m-oid=" + OID );
         
         try
@@ -151,7 +151,7 @@
             "m-singleValue: FALSE",
             "m-usage: directoryOperation" );
 
-        LdapDN dn = getAttributeTypeContainer( "nis" );
+        DN dn = getAttributeTypeContainer( "nis" );
         dn.add( "m-oid=" + OID );
         
         getSchemaContext( service ).createSubcontext( dn, attrs );
@@ -175,7 +175,7 @@
     {
         testAddAttributeTypeToEnabledSchema();
 
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
         // Check in Registries
@@ -207,7 +207,7 @@
     {
         testAddAttributeTypeToDisabledSchema();
 
-        LdapDN dn = getAttributeTypeContainer( "nis" );
+        DN dn = getAttributeTypeContainer( "nis" );
         dn.add( "m-oid=" + OID );
 
         // Check in Registries
@@ -235,7 +235,7 @@
     {
         testAddAttributeTypeToEnabledSchema();
 
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         addDependeeAttributeType();
         
@@ -267,7 +267,7 @@
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         
         ModificationItem[] mods = new ModificationItem[2];
@@ -299,7 +299,7 @@
         assertEquals( at.getDescription(), DESCRIPTION0 );
         assertEquals( at.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -329,10 +329,10 @@
         testAddAttributeTypeToEnabledSchema();
 
         LdapContext schemaRoot = getSchemaContext( service );
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         
-        LdapDN newdn = getAttributeTypeContainer( "apachemeta" );
+        DN newdn = getAttributeTypeContainer( "apachemeta" );
         newdn.add( "m-oid=" + NEW_OID );
         schemaRoot.rename( dn, newdn );
 
@@ -358,11 +358,11 @@
     {
         testAddAttributeTypeToEnabledSchema();
 
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
         addDependeeAttributeType();
         
-        LdapDN newdn = getAttributeTypeContainer( "apachemeta" );
+        DN newdn = getAttributeTypeContainer( "apachemeta" );
         newdn.add( "m-oid=" + NEW_OID );
         
         try
@@ -389,10 +389,10 @@
     {
         testAddAttributeTypeToEnabledSchema();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
-        LdapDN newdn = getAttributeTypeContainer( "apache" );
+        DN newdn = getAttributeTypeContainer( "apache" );
         newdn.add( "m-oid=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -411,10 +411,10 @@
     {
         testAddAttributeTypeToEnabledSchema();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
-        LdapDN newdn = getAttributeTypeContainer( "apache" );
+        DN newdn = getAttributeTypeContainer( "apache" );
         newdn.add( "m-oid=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -436,10 +436,10 @@
     {
         testAddAttributeTypeToEnabledSchema();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid=" + OID );
         
         try
@@ -463,10 +463,10 @@
     {
         testAddAttributeTypeToEnabledSchema();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "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
@@ -490,11 +490,11 @@
     {
         testAddAttributeTypeToEnabledSchema();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getAttributeTypeContainer( "nis" );
+        DN newdn = getAttributeTypeContainer( "nis" );
         newdn.add( "m-oid=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -511,10 +511,10 @@
         testAddAttributeTypeToEnabledSchema();
         addDependeeAttributeType();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
-        LdapDN newdn = getAttributeTypeContainer( "apache" );
+        DN newdn = getAttributeTypeContainer( "apache" );
         newdn.add( "m-oid=" + OID );
         
         try
@@ -539,10 +539,10 @@
         testAddAttributeTypeToEnabledSchema();
         addDependeeAttributeType();
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + OID );
 
-        LdapDN newdn = getAttributeTypeContainer( "apache" );
+        DN newdn = getAttributeTypeContainer( "apache" );
         newdn.add( "m-oid=" + NEW_OID );
         
         try
@@ -577,7 +577,7 @@
             "m-usage: directoryOperation",
             "m-supAttributeType", OID );
         
-        LdapDN dn = getAttributeTypeContainer( "apachemeta" );
+        DN dn = getAttributeTypeContainer( "apachemeta" );
         dn.add( "m-oid=" + DEPENDEE_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -597,13 +597,13 @@
         testAddAttributeTypeToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN 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 ) );
 
-        LdapDN 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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -44,7 +44,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.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator;
@@ -101,7 +101,7 @@
             "objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
             "m-description: A test comparator" );
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -128,7 +128,7 @@
             "m-description: A test comparator" );
 
         // nis is by default inactive
-        LdapDN dn = getComparatorContainer( "nis" );
+        DN dn = getComparatorContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -153,7 +153,7 @@
             "m-description: A test comparator" );
 
         // nis is by default inactive
-        LdapDN dn = getComparatorContainer( "notloaded" );
+        DN dn = getComparatorContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -194,7 +194,7 @@
             "m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator", "m-bytecode", out
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -230,7 +230,7 @@
                 .toByteArray(), "m-oid", OID, "m-description: A test comparator" );
 
         // nis is by default inactive
-        LdapDN dn = getComparatorContainer( "nis" );
+        DN dn = getComparatorContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -254,7 +254,7 @@
     @Test
     public void testDeleteComparatorFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         testAddComparatorToEnabledSchema();
@@ -286,7 +286,7 @@
     @Test
     public void testDeleteComparatorFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getComparatorContainer( "nis" );
+        DN dn = getComparatorContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         testAddComparatorToDisabledSchema();
 
@@ -318,7 +318,7 @@
     @Test
     public void testDeleteComparatorWhenInUse() throws Exception
     {
-        LdapDN cDn = getComparatorContainer( "apachemeta" );
+        DN cDn = getComparatorContainer( "apachemeta" );
         cDn.add( "m-oid" + "=" + OID );
 
         // Create a new Comparator
@@ -335,7 +335,7 @@
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description: test" );
 
-        LdapDN mrDn = getMatchingRuleContainer( "apachemeta" );
+        DN mrDn = getMatchingRuleContainer( "apachemeta" );
         mrDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -373,7 +373,7 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         ModificationItem[] mods = new ModificationItem[1];
@@ -397,7 +397,7 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         Attributes mods = new BasicAttributes( true );
@@ -421,11 +421,11 @@
     @Ignore
     public void testRenameComparator() throws Exception
     {
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddComparatorToEnabledSchema();
 
-        LdapDN newdn = getComparatorContainer( "apachemeta" );
+        DN newdn = getComparatorContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -451,12 +451,12 @@
     @Ignore
     public void testRenameComparatorWhenInUse() throws Exception
     {
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        LdapDN newdn = getComparatorContainer( "apachemeta" );
+        DN newdn = getComparatorContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -485,10 +485,10 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getComparatorContainer( "apache" );
+        DN newdn = getComparatorContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( dn, newdn );
@@ -509,10 +509,10 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getComparatorContainer( "apache" );
+        DN newdn = getComparatorContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
 
         getSchemaContext( service ).rename( dn, newdn );
@@ -539,10 +539,10 @@
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getComparatorContainer( "apache" );
+        DN newdn = getComparatorContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -569,10 +569,10 @@
         testAddComparatorToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getComparatorContainer( "apache" );
+        DN newdn = getComparatorContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
 
         try
@@ -602,10 +602,10 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
 
         try
@@ -629,10 +629,10 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = new LdapDN( "ou=normalizers,cn=apachemeta" );
+        DN newdn = new DN( "ou=normalizers,cn=apachemeta" );
         newdn.add( "m-oid" + "=" + OID );
 
         try
@@ -656,11 +656,11 @@
     {
         testAddComparatorToEnabledSchema();
 
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getComparatorContainer( "nis" );
+        DN newdn = getComparatorContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
 
         getSchemaContext( service ).rename( dn, newdn );
@@ -676,13 +676,13 @@
         testAddComparatorToDisabledSchema();
 
         // nis is inactive by default
-        LdapDN dn = getComparatorContainer( "nis" );
+        DN dn = getComparatorContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "comparator OID should NOT be present when added to disabled nis schema", schemaManager
             .getComparatorRegistry().contains( OID ) );
 
-        LdapDN newdn = getComparatorContainer( "apachemeta" );
+        DN newdn = getComparatorContainer( "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/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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
 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.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.comparators.StringComparator;
@@ -87,7 +87,7 @@
             "m-oid: " + OID,
             "m-description: A test comparator" );
         
-        LdapDN dn = getComparatorContainer( "apachemeta" );
+        DN dn = getComparatorContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         // Addition
@@ -116,7 +116,7 @@
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
 
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         // Pre-checks
@@ -146,7 +146,7 @@
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
         
-        LdapDN dn = getMatchingRuleContainer( "nis" );
+        DN dn = getMatchingRuleContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -169,7 +169,7 @@
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description", DESCRIPTION0 );
         
-        LdapDN dn = getMatchingRuleContainer( "notloaded" );
+        DN dn = getMatchingRuleContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
         
         try
@@ -194,7 +194,7 @@
     @Test
     public void testDeleteMatchingRuleFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToEnabledSchema();
         
@@ -223,7 +223,7 @@
     @Test
     public void testDeleteMatchingRuleFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getMatchingRuleContainer( "nis" );
+        DN dn = getMatchingRuleContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToDisabledSchema();
         
@@ -252,7 +252,7 @@
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         ModificationItem[] mods = new ModificationItem[2];
@@ -284,7 +284,7 @@
         assertEquals( mr.getDescription(), DESCRIPTION0 );
         assertEquals( mr.getSyntax().getOid(), SchemaConstants.INTEGER_SYNTAX );
 
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -311,11 +311,11 @@
     @Ignore
     public void testRenameMatchingRule() throws Exception
     {
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN newdn = getMatchingRuleContainer( "apachemeta" );
+        DN newdn = getMatchingRuleContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -344,10 +344,10 @@
     {
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getMatchingRuleContainer( "apache" );
+        DN newdn = getMatchingRuleContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -366,10 +366,10 @@
     {
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getMatchingRuleContainer( "apache" );
+        DN newdn = getMatchingRuleContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -392,7 +392,7 @@
     
 //    public void testDeleteSyntaxWhenInUse() throws NamingException
 //    {
-//        LdapDN dn = getSyntaxContainer( "apachemeta" );
+//        DN dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );
 //        testAddSyntax();
 //        addDependeeMatchingRule();
@@ -417,10 +417,10 @@
 //        testAddSyntax();
 //        addDependeeMatchingRule();
 //        
-//        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
@@ -443,10 +443,10 @@
 //        testAddSyntax();
 //        addDependeeMatchingRule()
 //        
-//        LdapDN dn = getSyntaxContainer( "apachemeta" );
+//        DN dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );s
 //
-//        LdapDN newdn = getSyntaxContainer( "apache" );
+//        DN newdn = getSyntaxContainer( "apache" );
 //        newdn.add( "m-oid" + "=" + NEW_OID );
 //        
 //        try
@@ -475,12 +475,12 @@
 //    
 //    public void testRenameNormalizerWhenInUse() throws NamingException
 //    {
-//        LdapDN dn = getSyntaxContainer( "apachemeta" );
+//        DN dn = getSyntaxContainer( "apachemeta" );
 //        dn.add( "m-oid" + "=" + OID );
 //        testAddSyntax();
 //        addDependeeMatchingRule();
 //        
-//        LdapDN newdn = getSyntaxContainer( "apachemeta" );
+//        DN newdn = getSyntaxContainer( "apachemeta" );
 //        newdn.add( "m-oid" + "=" + NEW_OID );
 //        
 //        try
@@ -509,10 +509,10 @@
     {
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
         
         try
@@ -536,10 +536,10 @@
     {
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "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
@@ -563,11 +563,11 @@
     {
         testAddMatchingRuleToEnabledSchema();
         
-        LdapDN dn = getMatchingRuleContainer( "apachemeta" );
+        DN dn = getMatchingRuleContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getMatchingRuleContainer( "nis" );
+        DN newdn = getMatchingRuleContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -584,13 +584,13 @@
         testAddMatchingRuleToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN dn = getMatchingRuleContainer( "nis" );
+        DN dn = getMatchingRuleContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "matchingRule OID should NOT be present when added to disabled nis schema", 
             schemaManager.getMatchingRuleRegistry().contains( OID ) );
 
-        LdapDN newdn = getMatchingRuleContainer( "apachemeta" );
+        DN newdn = getMatchingRuleContainer( "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/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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -44,7 +44,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.MatchingRule;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
@@ -92,7 +92,7 @@
             "m-oid", OID,
             "m-description: A test normalizer" );
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -116,7 +116,7 @@
             "m-description: A test normalizer" );
         
         // nis is by default inactive
-        LdapDN dn = getNormalizerContainer( "nis" );
+        DN dn = getNormalizerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -138,7 +138,7 @@
             "m-description: A test normalizer" );
         
         // nis is by default inactive
-        LdapDN dn = getNormalizerContainer( "notloaded" );
+        DN dn = getNormalizerContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
 
         try
@@ -177,7 +177,7 @@
             "m-oid", OID,
             "m-description: A test normalizer" );
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -209,7 +209,7 @@
             "m-oid", OID,
             "m-description: A test normalizer" );
         
-        LdapDN dn = getNormalizerContainer( "nis" );
+        DN dn = getNormalizerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -221,7 +221,7 @@
     @Test
     public void testDeleteNormalizerFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
         
@@ -250,7 +250,7 @@
     @Test
     public void testDeleteNormalizerFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
 
@@ -280,11 +280,11 @@
     @Ignore
     public void testRenameNormalizer() throws Exception
     {
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
         
-        LdapDN newdn = getNormalizerContainer( "apachemeta" );
+        DN newdn = getNormalizerContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -313,10 +313,10 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getNormalizerContainer( "apache" );
+        DN newdn = getNormalizerContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -338,10 +338,10 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getNormalizerContainer( "apache" );
+        DN newdn = getNormalizerContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -366,7 +366,7 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         ModificationItem[] mods = new ModificationItem[1];
@@ -391,7 +391,7 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -415,7 +415,7 @@
     @Test
     public void testDeleteNormalizerWhenInUse() throws Exception
     {
-        LdapDN nDn = getNormalizerContainer( "apachemeta" );
+        DN nDn = getNormalizerContainer( "apachemeta" );
         nDn.add( "m-oid" + "=" + OID );
 
         // Create a new Normalizer
@@ -432,7 +432,7 @@
             "m-syntax", SchemaConstants.INTEGER_SYNTAX,
             "m-description: test" );
 
-        LdapDN mrDn = getMatchingRuleContainer( "apachemeta" );
+        DN mrDn = getMatchingRuleContainer( "apachemeta" );
         mrDn.add( "m-oid" + "=" + OID );
 
         // Pre-checks
@@ -468,10 +468,10 @@
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getNormalizerContainer( "apache" );
+        DN newdn = getNormalizerContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -498,10 +498,10 @@
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getNormalizerContainer( "apache" );
+        DN newdn = getNormalizerContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -525,12 +525,12 @@
     @Ignore
     public void testRenameNormalizerWhenInUse() throws Exception
     {
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         testAddNormalizerToEnabledSchema();
         schemaManager.getMatchingRuleRegistry().register( new DummyMR() );
         
-        LdapDN newdn = getNormalizerContainer( "apachemeta" );
+        DN newdn = getNormalizerContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -561,10 +561,10 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
         
         try
@@ -588,10 +588,10 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "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
@@ -615,11 +615,11 @@
     {
         testAddNormalizerToEnabledSchema();
         
-        LdapDN dn = getNormalizerContainer( "apachemeta" );
+        DN dn = getNormalizerContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getNormalizerContainer( "nis" );
+        DN newdn = getNormalizerContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -636,13 +636,13 @@
         testAddNormalizerToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN dn = getNormalizerContainer( "nis" );
+        DN dn = getNormalizerContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "normalizer OID should NOT be present when added to disabled nis schema", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
 
-        LdapDN newdn = getNormalizerContainer( "apachemeta" );
+        DN newdn = getNormalizerContainer( "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/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=918771&r1=918770&r2=918771&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 Wed Mar  3 23:29:19 2010
@@ -40,7 +40,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.ObjectClass;
 import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
 import org.junit.Ignore;
@@ -76,7 +76,7 @@
     }
     
     
-    private LdapDN addObjectClass() throws Exception
+    private DN addObjectClass() throws Exception
     {
         Attributes attrs = LdifUtils.createAttributes( 
             "objectClass: top",
@@ -89,7 +89,7 @@
             "m-must: cn",
             "m-may: ou" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -103,7 +103,7 @@
     @Test
     public void testAddObjectClassToEnabledSchema() throws Exception
     {
-        LdapDN dn = addObjectClass();
+        DN dn = addObjectClass();
         
         assertTrue( getObjectClassRegistry().contains( OID ) );
         assertEquals( getObjectClassRegistry().getSchemaName( OID ), "apachemeta" );
@@ -114,7 +114,7 @@
     @Test
     public void testAddObjectClassToDisabledSchema() throws Exception
     {
-        LdapDN dn = addObjectClassToDisabledSchema();
+        DN dn = addObjectClassToDisabledSchema();
         
         assertFalse( "adding new objectClass to disabled schema should not register it into the registries", 
             getObjectClassRegistry().contains( OID ) );
@@ -136,7 +136,7 @@
             "m-must: cn",
             "m-may: ou" );
 
-        LdapDN dn = getObjectClassContainer( "notloaded" );
+        DN dn = getObjectClassContainer( "notloaded" );
         dn.add( "m-oid" + "=" + OID );
         
         try
@@ -158,7 +158,7 @@
     @Test
     public void testDeleteObjectClassFromEnabledSchema() throws Exception
     {
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         addObjectClass();
 
@@ -187,7 +187,7 @@
     @Test
     public void testDeleteObjectClassFromDisabledSchema() throws Exception
     {
-        LdapDN dn = getObjectClassContainer( "nis" );
+        DN dn = getObjectClassContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         addObjectClassToDisabledSchema();
         
@@ -217,11 +217,11 @@
     @Ignore
     public void testRenameObjectClassType() throws Exception
     {
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         addObjectClass();
         
-        LdapDN newdn = getObjectClassContainer( "apachemeta" );
+        DN newdn = getObjectClassContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).rename( dn, newdn );
 
@@ -248,10 +248,10 @@
     {
         addObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getObjectClassContainer( "apache" );
+        DN newdn = getObjectClassContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -270,10 +270,10 @@
     {
         addObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getObjectClassContainer( "apache" );
+        DN newdn = getObjectClassContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -299,7 +299,7 @@
         assertEquals( oc.getDescription(), DESCRIPTION0 );
         assertEquals( oc.getName(), NAME );
 
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         ModificationItem[] mods = new ModificationItem[2];
@@ -331,7 +331,7 @@
         assertEquals( oc.getDescription(), DESCRIPTION0 );
         assertEquals( oc.getName(), NAME );
 
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         Attributes mods = new BasicAttributes( true );
@@ -369,7 +369,7 @@
         attrs.put( "m-may", "ou" );
         attrs.put( "m-supObjectClass", OID );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + DEPENDEE_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -381,7 +381,7 @@
     @Test
     public void testDeleteObjectClassWhenInUse() throws Exception
     {
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         addObjectClass();
         addDependeeObjectClass();
@@ -408,10 +408,10 @@
         addObjectClass();
         addDependeeObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getObjectClassContainer( "apache" );
+        DN newdn = getObjectClassContainer( "apache" );
         newdn.add( "m-oid" + "=" + OID );
         
         try
@@ -436,10 +436,10 @@
         addObjectClass();
         addDependeeObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN newdn = getObjectClassContainer( "apache" );
+        DN newdn = getObjectClassContainer( "apache" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -461,12 +461,12 @@
     @Ignore
     public void testRenameObjectClassWhenInUse() throws Exception
     {
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         addObjectClass();
         addDependeeObjectClass();
         
-        LdapDN newdn = getObjectClassContainer( "apachemeta" );
+        DN newdn = getObjectClassContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -493,10 +493,10 @@
     {
         addObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
-        LdapDN top = new LdapDN();
+        DN top = new DN();
         top.add( "m-oid" + "=" + OID );
         
         try
@@ -520,10 +520,10 @@
     {
         addObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "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
@@ -541,7 +541,7 @@
     }
 
     
-    private LdapDN addObjectClassToDisabledSchema() throws Exception
+    private DN addObjectClassToDisabledSchema() throws Exception
     {
         Attributes attrs = LdifUtils.createAttributes( 
             "objectClass: top",
@@ -554,7 +554,7 @@
             "m-must: cn",
             "m-may: ou" );
 
-        LdapDN dn = getObjectClassContainer( "nis" );
+        DN dn = getObjectClassContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -568,11 +568,11 @@
     {
         addObjectClass();
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
 
         // nis is inactive by default
-        LdapDN newdn = getObjectClassContainer( "nis" );
+        DN newdn = getObjectClassContainer( "nis" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -589,13 +589,13 @@
         addObjectClassToDisabledSchema();
         
         // nis is inactive by default
-        LdapDN dn = getObjectClassContainer( "nis" );
+        DN dn = getObjectClassContainer( "nis" );
         dn.add( "m-oid" + "=" + OID );
 
         assertFalse( "objectClass OID should NOT be present when added to disabled nis schema", 
             getObjectClassRegistry().contains( OID ) );
 
-        LdapDN newdn = getObjectClassContainer( "apachemeta" );
+        DN newdn = getObjectClassContainer( "apachemeta" );
         newdn.add( "m-oid" + "=" + OID );
         
         getSchemaContext( service ).rename( dn, newdn );
@@ -630,7 +630,7 @@
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -663,7 +663,7 @@
         sup.add( "javaSerializedObject");
         attrs.put( sup );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         try
@@ -702,7 +702,7 @@
         sup.add( "person");
         attrs.put( sup );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         try
@@ -737,7 +737,7 @@
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -770,7 +770,7 @@
         sup.add( "javaNamingReference");
         attrs.put( sup );
 
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -803,7 +803,7 @@
         sup.add( "person");
         attrs.put( sup );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + OID );
         
         try
@@ -838,7 +838,7 @@
         attrs.put( "m-must", "cn" );
         attrs.put( "m-may", "ou" );
         
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( dn, attrs );
         
@@ -871,7 +871,7 @@
         sup.add( "javaNamingReference");
         attrs.put( sup );
 
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + NEW_OID );
         
         try
@@ -910,7 +910,7 @@
         sup.add( "person");
         attrs.put( sup );
 
-        LdapDN dn = getObjectClassContainer( "apachemeta" );
+        DN dn = getObjectClassContainer( "apachemeta" );
         dn.add( "m-oid" + "=" + NEW_OID );
         getSchemaContext( service ).createSubcontext( 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=918771&r1=918770&r2=918771&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 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.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -394,7 +394,7 @@
     @Test
     public void testAddEnabledValidSchema() throws Exception
     {
-        LdapDN dn = getSchemaContainer( "dummy" );
+        DN dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -415,7 +415,7 @@
     @Test
     public void testAddEnabledSchemaWithExistingEnabledDeps() throws Exception
     {
-        LdapDN dn = getSchemaContainer( "dummy" );
+        DN dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -443,7 +443,7 @@
     @Test
     public void testAddEnabledSchemaWithExistingDisabledDeps() throws Exception
     {
-        LdapDN dn = getSchemaContainer( "dummy" );
+        DN dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -477,7 +477,7 @@
     @Test
     public void testAddEnabledSchemaWithNotExistingDeps() throws Exception
     {
-        LdapDN dn = getSchemaContainer( "dummy" );
+        DN dn = getSchemaContainer( "dummy" );
 
         assertFalse( isOnDisk( dn ) );
 
@@ -514,7 +514,7 @@
     @Test
     public void testDeleteEnabledValidSchema() throws Exception
     {
-        LdapDN dn = getSchemaContainer( "dummy" );
+        DN dn = getSchemaContainer( "dummy" );
         LdapContext schemaRoot = getSchemaContext( service );
         
         // Create a schema we will delete



Mime
View raw message