directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [15/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/s...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java Sun Jan 23 01:17:06 2011
@@ -91,7 +91,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -288,7 +288,7 @@ public class AddIT extends AbstractLdapT
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultEntry( new DN( dn ) );
+        Entry kate = new DefaultEntry( new Dn( dn ) );
 
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
@@ -328,7 +328,7 @@ public class AddIT extends AbstractLdapT
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultEntry( new DN( dn ) );
+        Entry kate = new DefaultEntry( new Dn( dn ) );
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
         kate.add( "cn", "Kate Bush" );
@@ -368,7 +368,7 @@ public class AddIT extends AbstractLdapT
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry kate = new DefaultEntry( new DN( dn ) );
+        Entry kate = new DefaultEntry( new Dn( dn ) );
 
         kate.add( "objectclass", "top", "person" );
         kate.add( "sn", "Bush" );
@@ -739,7 +739,7 @@ public class AddIT extends AbstractLdapT
             principalDn = "";
         }
 
-        DN userDn = new DN( principalDn, service.getSchemaManager() );
+        Dn userDn = new Dn( principalDn, service.getSchemaManager() );
         LdapPrincipal principal = new LdapPrincipal( userDn, AuthenticationLevel.SIMPLE );
 
         if ( dn == null )
@@ -906,7 +906,7 @@ public class AddIT extends AbstractLdapT
 
 
     /**
-     * Create an entry a RDN which is not present in the entry
+     * Create an entry a Rdn which is not present in the entry
      */
     @Test
     public void testAddEntryNoRDNInEntry() throws Exception
@@ -944,7 +944,7 @@ public class AddIT extends AbstractLdapT
 
 
     /**
-     * Create an entry a RDN which is not present in the entry, but
+     * Create an entry a Rdn which is not present in the entry, but
      * with another attribute's value
      */
     @Test
@@ -991,7 +991,7 @@ public class AddIT extends AbstractLdapT
 
 
     /**
-     * Create an entry a RDN which is not present in the entry, 
+     * Create an entry a Rdn which is not present in the entry,
      * with another attribute's value, and on a SingleValued attribute
      */
     @Test
@@ -1033,7 +1033,7 @@ public class AddIT extends AbstractLdapT
 
 
     /**
-     * Create an entry a composed RDN which is not present in the entry, 
+     * Create an entry a composed Rdn which is not present in the entry,
      * with another attribute's value, and on a SingleValued attribute
      */
     @Test
@@ -1197,9 +1197,9 @@ public class AddIT extends AbstractLdapT
 
 
     /**
-     * Test for DIRSERVER-1311: If the RDN attribute+value is not present
+     * Test for DIRSERVER-1311: If the Rdn attribute+value is not present
      * in the entry the server should implicit add this attribute+value to
-     * the entry. Additionally, if the RDN value is escaped or a hexstring
+     * the entry. Additionally, if the Rdn value is escaped or a hexstring
      * the server must add the unescaped string or binary value to the entry.
      */
     @Test
@@ -1215,9 +1215,9 @@ public class AddIT extends AbstractLdapT
         tori.put( "cn", "Tori Amos" );
         tori.put( "sn", "Amos" );
         /*
-         * Note that the RDN attribute is different to the cn specified in the entry.
+         * Note that the Rdn attribute is different to the cn specified in the entry.
          * This creates a second cn attribute "cn:Amos,Tori". This is a JNDI hack:
-         * If no other cn is available in the entry, JNDI adds the RDN 
+         * If no other cn is available in the entry, JNDI adds the Rdn
          * attribute to the entry before sending the request to the server.
          */
         ctx.createSubcontext( " cn = Amos\\,Tori ", tori );
@@ -1231,10 +1231,10 @@ public class AddIT extends AbstractLdapT
         binary.put( "sn", "Binary" );
         binary.put( "userPassword", "test" );
         /*
-         * Note that the RDN attribute is different to the userPassword specified 
+         * Note that the Rdn attribute is different to the userPassword specified
          * in the entry. This creates a second cn attribute "userPassword:#414243". 
          * This is a JNDI hack:
-         * If no other userPassword is available in the entry, JNDI adds the RDN 
+         * If no other userPassword is available in the entry, JNDI adds the Rdn
          * attribute to the entry before sending the request to the server.
          */
         ctx.createSubcontext( " userPassword = #414243 ", binary );
@@ -1268,7 +1268,7 @@ public class AddIT extends AbstractLdapT
         LdapConnection con = getClientApiConnection( ldapServer );
 
         String dn = "cn=Kate Bush," + BASE;
-        Entry entry = new DefaultEntry( new DN( dn ) );
+        Entry entry = new DefaultEntry( new Dn( dn ) );
         entry.add( "objectclass", "top", "person" );
         entry.add( "sn", "Bush" );
         entry.add( "cn", "Kate Bush" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Sun Jan 23 01:17:06 2011
@@ -38,14 +38,14 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 
 /**
  * Test case to demonstrate DIRSERVER-631 ("Creation of entry with special (and
- * escaped) character in RDN leads to wrong attribute value").
+ * escaped) character in Rdn leads to wrong attribute value").
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -76,7 +76,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with hash sign (#) in RDN.
+     * adding an entry with hash sign (#) in Rdn.
      * 
      * @throws Exception 
      */
@@ -87,7 +87,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry personEntry = getPersonEntry( "Bush", "Kate#Bush" );
         String dn = "cn=Kate\\#Bush,ou=system";
-        personEntry.setDn( new DN( dn ) );
+        personEntry.setDn( new Dn( dn ) );
         connection.add( personEntry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(cn=Kate#Bush)", SearchScope.SUBTREE, "*" );
@@ -111,7 +111,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with comma sign (,) in RDN.
+     * adding an entry with comma sign (,) in Rdn.
      *    
      * @throws Exception 
      */
@@ -122,7 +122,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getPersonEntry( "Bush", "Bush, Kate" );
         String dn = "cn=Bush\\, Kate,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(cn=Bush, Kate)", SearchScope.SUBTREE, "*" );
@@ -147,7 +147,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with quotes (") in RDN.
+     * adding an entry with quotes (") in Rdn.
      */
     @Test
     public void testAddingWithQuotesInRdn() throws Exception
@@ -156,7 +156,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getPersonEntry( "Messer", "Mackie \"The Knife\" Messer" );
         String dn = "cn=Mackie \\\"The Knife\\\" Messer,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(cn=Mackie \"The Knife\" Messer)",
@@ -179,7 +179,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with backslash (\) in RDN.
+     * adding an entry with backslash (\) in Rdn.
      */
     @Test
     public void testAddingWithBackslashInRdn() throws Exception
@@ -188,7 +188,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getOrgUnitEntry( "AC\\DC" );
         String dn = "ou=AC\\\\DC,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(ou=AC\\5CDC)", SearchScope.SUBTREE, "*" );
@@ -211,7 +211,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with greater sign (>) in RDN.
+     * adding an entry with greater sign (>) in Rdn.
      * 
      * @throws Exception 
      */
@@ -222,7 +222,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getOrgUnitEntry( "East -> West" );
         String dn = "ou=East -\\> West,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection
@@ -247,7 +247,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with less sign (<) in RDN.
+     * adding an entry with less sign (<) in Rdn.
      * 
      * @throws Exception 
      */
@@ -258,7 +258,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getOrgUnitEntry( "Scissors 8<" );
         String dn = "ou=Scissors 8\\<,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(ou=Scissors 8<)", SearchScope.SUBTREE, "*" );
@@ -283,7 +283,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with semicolon (;) in RDN.
+     * adding an entry with semicolon (;) in Rdn.
      * 
      * @throws Exception 
      */
@@ -294,7 +294,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getOrgUnitEntry( "semicolon group;" );
         String dn = "ou=semicolon group\\;,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(ou=semicolon group;)", SearchScope.SUBTREE,
@@ -319,7 +319,7 @@ public class AddingEntriesWithSpecialCha
 
 
     /**
-     * adding an entry with equals sign (=) in RDN.
+     * adding an entry with equals sign (=) in Rdn.
      * 
      * @throws Exception 
      */
@@ -330,7 +330,7 @@ public class AddingEntriesWithSpecialCha
 
         Entry entry = getOrgUnitEntry( "nomen=omen" );
         String dn = "ou=nomen\\=omen,ou=system";
-        entry.setDn( new DN( dn ) );
+        entry.setDn( new Dn( dn ) );
         connection.add( entry );
 
         Cursor<Response> cursor = connection.search( "ou=system", "(ou=nomen=omen)", SearchScope.SUBTREE, "*" );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java Sun Jan 23 01:17:06 2011
@@ -111,7 +111,7 @@ public class BindIT extends AbstractLdap
 
 
     /**
-     * Test bind with malformed bind DN.
+     * Test bind with malformed bind Dn.
      */
     @Test
     public void testBadBindDnMalformed() throws Exception

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Sun Jan 23 01:17:06 2011
@@ -73,7 +73,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyRequest;
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -186,7 +186,7 @@ public class SaslBindIT extends Abstract
         ldapServer.setSaslPrincipal( servicePrincipal );
 
         ModifyRequest modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( new DN( "uid=ldap,ou=users,dc=example,dc=com" ) );
+        modifyRequest.setName( new Dn( "uid=ldap,ou=users,dc=example,dc=com" ) );
         modifyRequest.replace( "userPassword", "randall" );
         modifyRequest.replace( "krb5PrincipalName", servicePrincipal );
         service.getAdminSession().modify( modifyRequest );
@@ -228,7 +228,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslBindPLAIN() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         BindRequest bindReq = new BindRequestImpl();
         bindReq.setCredentials( "secret".getBytes() );
@@ -252,7 +252,7 @@ public class SaslBindIT extends Abstract
     @Ignore("Activate and fix when DIRAPI-36 (Provide a SaslBindRequest extending BindRequest that can be used in LdapConnection.bind(...) method) is solved")
     public void testSaslBindNoMech() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
         BindRequest bindReq = new BindRequestImpl();
         bindReq.setCredentials( "secret".getBytes() );
@@ -280,7 +280,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslCramMd5Bind() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindCramMd5( userDn.getRdn().getUpValue().getString(), "secret", null );
@@ -299,7 +299,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslCramMd5BindBadPassword() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindCramMd5( userDn.getRdn().getUpValue().getString(), "badsecret", null );
@@ -314,7 +314,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslDigestMd5Bind() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindDigestMd5( userDn.getRdn().getUpValue().getString(), "secret", null,
@@ -335,7 +335,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslGssApiBind() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindGssApi( userDn.getRdn().getUpValue().getString(), "secret", ldapServer
@@ -356,7 +356,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslDigestMd5BindBadRealm() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindDigestMd5( userDn.getName(), "secret", null, "badrealm.com" );
@@ -372,7 +372,7 @@ public class SaslBindIT extends Abstract
     @Test
     public void testSaslDigestMd5BindBadPassword() throws Exception
     {
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         BindResponse resp = connection.bindDigestMd5( userDn.getName(), "badsecret", null, ldapServer
@@ -445,7 +445,7 @@ public class SaslBindIT extends Abstract
         LdapNetworkConnection connection;
         BindResponse resp;
         Entry entry;
-        DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
+        Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
 
         for ( int i = 0; i < 1000; i++ )
         {
@@ -515,7 +515,7 @@ public class SaslBindIT extends Abstract
 
             // Setup the bind request
             BindRequestImpl request = new BindRequestImpl( 1 );
-            request.setName( new DN( "uid=admin,ou=system" ) );
+            request.setName( new Dn( "uid=admin,ou=system" ) );
             request.setSimple( false );
             request.setCredentials( type1response );
             request.setSaslMechanism( mechanism );
@@ -554,7 +554,7 @@ public class SaslBindIT extends Abstract
 
             // Setup the bind request
             BindRequestImpl request = new BindRequestImpl( 2 );
-            request.setName( new DN( "uid=admin,ou=system" ) );
+            request.setName( new Dn( "uid=admin,ou=system" ) );
             request.setSimple( false );
             request.setCredentials( type3response );
             request.setSaslMechanism( mechanism );
@@ -610,7 +610,7 @@ public class SaslBindIT extends Abstract
     protected Entry getPrincipalAttributes( String dn, String sn, String cn, String uid, String userPassword,
         String principal ) throws LdapException
     {
-        Entry entry = new DefaultEntry( new DN( dn ) );
+        Entry entry = new DefaultEntry( new Dn( dn ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "person", "inetOrgPerson", "krb5principal", "krb5kdcentry" );
         entry.add( SchemaConstants.CN_AT, cn );
         entry.add( SchemaConstants.SN_AT, sn );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sun Jan 23 01:17:06 2011
@@ -189,7 +189,7 @@ public class SimpleBindIT extends Abstra
 
 
     /**
-     * try to connect using a user with an invalid DN: we should get a invalidDNSyntax error.
+     * try to connect using a user with an invalid Dn: we should get a invalidDNSyntax error.
      */
     @Test
     public void testSimpleBindBadPrincipalAPassword()
@@ -209,7 +209,7 @@ public class SimpleBindIT extends Abstra
         catch ( InvalidNameException ine )
         {
             // Error code 34 : LDAP_INVALID_DN_SYNTAX
-            assertTrue( ine.getMessage().startsWith( "[LDAP: error code 34 - Incorrect DN given" ) );
+            assertTrue( ine.getMessage().startsWith( "[LDAP: error code 34 - Incorrect Dn given" ) );
         }
         catch ( NamingException e )
         {

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java Sun Jan 23 01:17:06 2011
@@ -128,7 +128,7 @@ public class MatchingRuleCompareIT exten
     {
         DirContext ctx = ( DirContext ) ServerIntegrationUtils.getWiredContext( ldapServer ).lookup( "ou=system" );
         
-        // determine member DN of person
+        // determine member Dn of person
         DirContext member = ( DirContext ) ctx.lookup( PERSON_RDN );
         String memberDN = member.getNameInNamespace();
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java Sun Jan 23 01:17:06 2011
@@ -265,8 +265,8 @@ public class DeleteIT extends AbstractLd
 
 
     /**
-     * Try to delete an entry with invalid DN. The operation fails
-     * during parsing the given DN
+     * Try to delete an entry with invalid Dn. The operation fails
+     * during parsing the given Dn
      */
     @Test
     public void testDeleteWithIllegalName() throws Exception

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/DITUtilitiesSP.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +46,7 @@ public class DITUtilitiesSP
      *        the subtree to be deleted
      * @throws LdapException
      */
-    public static void deleteSubtree( CoreSession session, DN rdn ) throws Exception
+    public static void deleteSubtree( CoreSession session, Dn rdn ) throws Exception
     {
         EntryFilteringCursor results = session.list( rdn, AliasDerefMode.DEREF_ALWAYS, null );
         
@@ -55,12 +55,12 @@ public class DITUtilitiesSP
         while ( results.next() )
         {
             ClonedServerEntry result = results.get();
-            DN childRdn = result.getDn();
+            Dn childRdn = result.getDn();
             childRdn = childRdn.remove( 0 );
             deleteSubtree( session, childRdn );
         }
         
-        session.delete( (DN)rdn );
+        session.delete( (Dn)rdn );
         log.info( "Deleted: " + rdn );
     }
 }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Sun Jan 23 01:17:06 2011
@@ -146,8 +146,8 @@ public class StoredProcedureIT extends A
         
         JavaStoredProcUtils.loadStoredProcedureClass( spCtx, DITUtilitiesSP.class );
         
-        DN people = new DN( "ou=People" );
-        people = DN.normalize(  people, oids );
+        Dn people = new Dn( "ou=People" );
+        people = Dn.normalize(  people, oids );
         
         String spName = DITUtilitiesSP.class.getName() + ":deleteSubtree";
         Object[] params = new Object[] { new LdapContextParameter( "ou=system" ),

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
 import org.apache.directory.shared.ldap.message.ModifyResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -85,7 +85,7 @@ public class IllegalModificationIT exten
         LdapConnection con = getClientApiConnection( ldapServer );
 
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( DN ) );
+        modReq.setName( new Dn( DN ) );
         modReq.add( "description", "" );
 
         ModifyResponse resp = con.modify( modReq );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java Sun Jan 23 01:17:06 2011
@@ -489,7 +489,7 @@ public class ModifyAddIT  extends Abstra
 
     /**
      * Create a person entry and perform a modify op on an
-     * attribute which is part of the DN. This is not allowed.
+     * attribute which is part of the Dn. This is not allowed.
      *
      * A JIRA has been created for this bug : DIRSERVER_687
      */

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java Sun Jan 23 01:17:06 2011
@@ -283,7 +283,7 @@ public class ModifyRemoveIT extends Abst
 
 
     /**
-     * Remove a required attribute from RDN.
+     * Remove a required attribute from Rdn.
      * 
      * Expected Result: Deletion fails with SchemaViolationException.
      */
@@ -300,7 +300,7 @@ public class ModifyRemoveIT extends Abst
         try
         {
             ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, attrs );
-            fail( "Deletion of RDN attribute should fail." );
+            fail( "Deletion of Rdn attribute should fail." );
         }
         catch ( SchemaViolationException e )
         {
@@ -310,7 +310,7 @@ public class ModifyRemoveIT extends Abst
 
 
     /**
-     * Remove a not required attribute from RDN.
+     * Remove a not required attribute from Rdn.
      * 
      * Expected Result: Deletion fails with SchemaViolationException.
      */
@@ -319,12 +319,12 @@ public class ModifyRemoveIT extends Abst
     {
         DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
         
-        // Change RDN to another attribute
+        // Change Rdn to another attribute
         String newRdn = "description=an American singer-songwriter";
         ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
         ctx.rename( RDN, newRdn );
 
-        // Remove description, which is now RDN attribute
+        // Remove description, which is now Rdn attribute
         Attribute attr = new BasicAttribute( "description" );
         Attributes attrs = new BasicAttributes( true );
         attrs.put( attr );
@@ -332,14 +332,14 @@ public class ModifyRemoveIT extends Abst
         try
         {
             ctx.modifyAttributes( newRdn, DirContext.REMOVE_ATTRIBUTE, attrs );
-            fail( "Deletion of RDN attribute should fail." );
+            fail( "Deletion of Rdn attribute should fail." );
         }
         catch ( SchemaViolationException e )
         {
             // expected behaviour
         }
 
-        // Change RDN back to original
+        // Change Rdn back to original
         ctx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" );
         ctx.rename( newRdn, RDN );
     }
@@ -487,7 +487,7 @@ public class ModifyRemoveIT extends Abst
 
 
     /**
-     * Create a person entry and try to remove an attribute value from the RDN
+     * Create a person entry and try to remove an attribute value from the Rdn
      * by Replacement
      */
     @Test
@@ -520,7 +520,7 @@ public class ModifyRemoveIT extends Abst
 
 
     /**
-     * Create a person entry and try to remove an attribute from the RDN
+     * Create a person entry and try to remove an attribute from the Rdn
      */
     @Test
     public void testRemoveRdnAttribute() throws Exception
@@ -552,7 +552,7 @@ public class ModifyRemoveIT extends Abst
 
 
     /**
-     * Create a person entry and try to remove an attribute from the RDN
+     * Create a person entry and try to remove an attribute from the Rdn
      */
     @Test
     public void testRemoveRdnAttributeValue() throws Exception

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Sun Jan 23 01:17:06 2011
@@ -49,7 +49,7 @@ import org.junit.runner.RunWith;
 
 
 /**
- * Test case with different modify DN operations on a person entry.
+ * Test case with different modify Dn operations on a person entry.
  * Originally created to demonstrate DIREVE-173.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -297,7 +297,7 @@ public class ModifyRdnIT extends Abstrac
 
 
     /**
-     * Modify DN of an entry, changing RDN from cn to sn.
+     * Modify Dn of an entry, changing Rdn from cn to sn.
      */
     @Test
     public void testModifyRdnDifferentAttribute() throws Exception
@@ -346,7 +346,7 @@ public class ModifyRdnIT extends Abstrac
 
 
     /**
-     * Modify DN of an entry, changing RDN from cn to sn, 
+     * Modify Dn of an entry, changing Rdn from cn to sn,
      * delete old RDn, must fail because cn can not be deleted.
      */
     @Test
@@ -451,7 +451,7 @@ public class ModifyRdnIT extends Abstrac
 
     /**
      * Test for DIRSERVER-1096.
-     * Modify the RDN of an entry with an escaped new RDN. 
+     * Modify the Rdn of an entry with an escaped new Rdn.
      * Ensure that the attribute itself contains the unescaped value.
      */
     @Test
@@ -488,7 +488,7 @@ public class ModifyRdnIT extends Abstrac
         DirContext newCtx = ( DirContext ) ctx.lookup( newRdn );
         assertNotNull( newCtx );
 
-        // Check that the DN contains the escaped value
+        // Check that the Dn contains the escaped value
         assertEquals( "cn=" + newCnEscapedVal + "," + ctx.getNameInNamespace(), newCtx.getNameInNamespace() );
 
         // Check that cn contains the unescaped value
@@ -504,7 +504,7 @@ public class ModifyRdnIT extends Abstrac
 
     /**
      * Test for DIRSERVER-1096.
-     * Modify the RDN of an entry with an escaped new RDN. 
+     * Modify the Rdn of an entry with an escaped new Rdn.
      * Ensure that the attribute itself contains the unescaped value.
      */
     @Test
@@ -539,7 +539,7 @@ public class ModifyRdnIT extends Abstrac
         DirContext newCtx = ( DirContext ) ctx.lookup( newRdn );
         assertNotNull( newCtx );
 
-        // Check that the DN contains the escaped value
+        // Check that the Dn contains the escaped value
         assertEquals( "cn=\\23test," + ctx.getNameInNamespace(), newCtx.getNameInNamespace() );
 
         // Check that cn contains the unescaped value
@@ -555,7 +555,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: cn
      * - New Rdn: cn+sn
      * - Keep old Rdn
@@ -595,7 +595,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: cn
      * - New Rdn: cn+sn
      * - Delete old Rdn
@@ -635,7 +635,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: description
      * - New Rdn: cn+sn
      * - Keep old Rdn
@@ -675,7 +675,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: description
      * - New Rdn: cn+sn
      * - Delete old Rdn
@@ -715,7 +715,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: cn
      * - New Rdn: sn+telephoneNumber
      * - Keep old Rdn
@@ -761,7 +761,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify single valued RDN to a multi valued RDN.
+     * Modify single valued Rdn to a multi valued Rdn.
      * - Old Rdn: cn
      * - New Rdn: sn+telephoneNumber
      * - Delete old Rdn
@@ -821,7 +821,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify multi valued RDN to a single valued RDN.
+     * Modify multi valued Rdn to a single valued Rdn.
      * - Old Rdn: cn+sn
      * - New Rdn: cn
      * - Keep old Rdn
@@ -863,7 +863,7 @@ public class ModifyRdnIT extends Abstrac
     /**
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
-     * Modify multi valued RDN to a single valued RDN.
+     * Modify multi valued Rdn to a single valued Rdn.
      * - Old Rdn: cn+sn
      * - New Rdn: cn
      * - Delete old Rdn
@@ -923,7 +923,7 @@ public class ModifyRdnIT extends Abstrac
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
      * Tries to rename+deleteOldRdn an entry that has an operational attribute
-     * in its RDN. Must fail because an operational attribute can not be
+     * in its Rdn. Must fail because an operational attribute can not be
      * deleted.
      * 
      * @throws LdapException
@@ -968,7 +968,7 @@ public class ModifyRdnIT extends Abstrac
      * Test for DIRSERVER-1162 and DIRSERVER-1085.
      * 
      * Tries to rename+deleteOldRdn an entry that has the structural object class
-     * person in its RDN (objectClass=person,ou=system). Must fail because the 
+     * person in its Rdn (objectClass=person,ou=system). Must fail because the
      * structural object class can not be deleted.
      * 
      * @throws LdapException

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith;
 
 
 /**
- * Test case with different modify DN operations which move the entry under a 
+ * Test case with different modify Dn operations which move the entry under a
  * new superior.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -133,7 +133,7 @@ public class MoveIT extends AbstractLdap
 
         LdapConnection con = getClientApiConnection( ldapServer );
 
-        //now do something bad: try to move the entry to the same DN
+        //now do something bad: try to move the entry to the same Dn
         ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=parent,ou=system" );
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, resp.getLdapResult().getResultCode() );
     }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Sun Jan 23 01:17:06 2011
@@ -459,7 +459,7 @@ public class PersistentSearchIT extends 
         listener.result = null;
 
         // thread is still waiting for notifications try a modify
-        ctx.modifyAttributes( RDN, DirContext.REMOVE_ATTRIBUTE, new AttributesImpl( "description", PERSON_DESCRIPTION,
+        ctx.modifyAttributes( Rdn, DirContext.REMOVE_ATTRIBUTE, new AttributesImpl( "description", PERSON_DESCRIPTION,
             true ) );
         start = System.currentTimeMillis();
         while ( t.isAlive() )
@@ -472,7 +472,7 @@ public class PersistentSearchIT extends 
         }
 
         assertNull( listener.result );
-        //assertEquals( RDN, listener.result.getName() );
+        //assertEquals( Rdn, listener.result.getName() );
         //assertEquals( listener.result.control.getChangeType(), ChangeType.MODIFY );
     }*/
 
@@ -579,7 +579,7 @@ public class PersistentSearchIT extends 
             try
             {
                 ctx = ( LdapContext ) getWiredContext( ldapServer).lookup( BASE );
-                ctx.setRequestControls( JndiUtils.toJndiControls( ctxCtls ) );
+                ctx.setRequestControls( JndiUtils.toJndiControls(ctxCtls) );
                 isReady = true;
                 LOG.debug( "PSearchListener is ready and about to issue persistent search request." );
                 list = ctx.search( "", "objectClass=*", null );
@@ -645,7 +645,7 @@ public class PersistentSearchIT extends 
         public String toString()
         {
             StringBuffer buf = new StringBuffer();
-            buf.append( "DN: " ).append( getName() ).append( "\n" );
+            buf.append( "Dn: " ).append( getName() ).append( "\n" );
             
             if ( control != null )
             {

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Sun Jan 23 01:17:06 2011
@@ -65,7 +65,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.message.SearchRequestImpl;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.util.JndiUtils;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -400,7 +400,7 @@ public class SearchIT extends AbstractLd
 
 
     /**
-     * Search operation with a base DN which contains a BER encoded value.
+     * Search operation with a base Dn which contains a BER encoded value.
      */
     @Test
     public void testSearchWithBackslashEscapedBase() throws Exception
@@ -531,7 +531,7 @@ public class SearchIT extends AbstractLd
 
 
     /**
-     * Search operation with a base DN with quotes
+     * Search operation with a base Dn with quotes
      *
     @Test
     public void testSearchWithQuotesInBase() throws NamingException {
@@ -758,7 +758,7 @@ public class SearchIT extends AbstractLd
 
 
     /**
-     * Create a person entry with multivalued RDN and check its content. This
+     * Create a person entry with multivalued Rdn and check its content. This
      * testcase was created to demonstrate DIRSERVER-628.
      */
     @Test
@@ -793,7 +793,7 @@ public class SearchIT extends AbstractLd
 
 
     /**
-     * Create a person entry with multivalued RDN and check its name.
+     * Create a person entry with multivalued Rdn and check its name.
      */
     @Test
     public void testMultiValuedRdnName() throws Exception
@@ -1606,7 +1606,7 @@ public class SearchIT extends AbstractLd
             for ( int i = 0; i < 1000; i++ )
             {
                 String dn = "cn=user" + i + "," + BASE;
-                Entry kate = new DefaultEntry( new DN( dn ) );
+                Entry kate = new DefaultEntry( new Dn( dn ) );
 
                 kate.add( "objectclass", "top", "person" );
                 kate.add( "sn", "Bush" );
@@ -1670,7 +1670,7 @@ public class SearchIT extends AbstractLd
         long sizeLimit = 7;
         LdapConnection connection = getClientApiConnection( ldapServer );
         SearchRequest req = new SearchRequestImpl();
-        req.setBase( new DN( "ou=system" ) );
+        req.setBase( new Dn( "ou=system" ) );
         req.setFilter( "(ou=*)" );
         req.setScope( SearchScope.SUBTREE );
         req.setSizeLimit( sizeLimit );
@@ -1693,7 +1693,7 @@ public class SearchIT extends AbstractLd
     {
         LdapConnection connection = getClientApiConnection( ldapServer );
         SearchRequest req = new SearchRequestImpl();
-        req.setBase( new DN( "ou=schema" ) );
+        req.setBase( new Dn( "ou=schema" ) );
         req.setFilter( "(objectClass=*)" );
         req.setScope( SearchScope.SUBTREE );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsUpdateCertificateIT.java Sun Jan 23 01:17:06 2011
@@ -48,7 +48,7 @@ import org.apache.directory.server.ldap.
 import org.apache.directory.server.operations.bind.BogusNtlmProvider;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -125,7 +125,7 @@ public class LdapsUpdateCertificateIT ex
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
         Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
-            new DN( "uid=admin,ou=system" ) );
+            new Dn( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 
         // now update the certificate (over the wire)

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsConfidentialityIT.java Sun Jan 23 01:17:06 2011
@@ -62,7 +62,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.integ.ServerIntegrationUtils;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -125,7 +125,7 @@ public class StartTlsConfidentialityIT e
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        Entry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
+        Entry entry = session.lookup( new Dn( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Sun Jan 23 01:17:06 2011
@@ -54,7 +54,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -119,7 +119,7 @@ public class StartTlsIT extends Abstract
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        Entry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
+        Entry entry = session.lookup( new Dn( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsUpdateCertificateIT.java Sun Jan 23 01:17:06 2011
@@ -52,7 +52,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -115,7 +115,7 @@ public class StartTlsUpdateCertificateIT
         
         ksFile = File.createTempFile( "testStore", "ks" );
         CoreSession session = ldapServer.getDirectoryService().getAdminSession();
-        Entry entry = session.lookup( new DN( "uid=admin,ou=system" ), CERT_IDS );
+        Entry entry = session.lookup( new Dn( "uid=admin,ou=system" ), CERT_IDS );
         byte[] userCertificate = entry.get( CERT_IDS[0] ).getBytes();
         assertNotNull( userCertificate );
 
@@ -175,7 +175,7 @@ public class StartTlsUpdateCertificateIT
         String newIssuerDN = "cn=new_issuer_dn";
         String newSubjectDN = "cn=new_subject_dn";
         Entry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
-            new DN( "uid=admin,ou=system" ) );
+            new Dn( "uid=admin,ou=system" ) );
         TlsKeyGenerator.addKeyPair( entry, newIssuerDN, newSubjectDN, "RSA" );
 
         // now update the certificate (over the wire)

Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.server.proto
 import org.apache.directory.server.protocol.shared.store.LdifLoadFilter;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.registries.SchemaLoader;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -260,7 +260,7 @@ public class ApacheDS
      */
     private void ensureLdifFileBase() throws Exception
     {
-        DN dn = new DN( ServerDNConstants.LDIF_FILES_DN );
+        Dn dn = new Dn( ServerDNConstants.LDIF_FILES_DN );
         Entry entry = null;
         
         try
@@ -274,7 +274,7 @@ public class ApacheDS
 
         if ( entry == null )
         {
-            entry = directoryService.newEntry( new DN( ServerDNConstants.LDIF_FILES_DN ) );
+            entry = directoryService.newEntry( new Dn( ServerDNConstants.LDIF_FILES_DN ) );
             entry.add( SchemaConstants.OU_AT, "loadedLdifFiles" );
             entry.add( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
     
@@ -288,13 +288,13 @@ public class ApacheDS
      * 
      * It is associated with the attributeType wrt to the underlying system.
      */
-    private DN buildProtectedFileEntryDn( File ldif ) throws Exception
+    private Dn buildProtectedFileEntryDn( File ldif ) throws Exception
     {
         String fileSep = File.separatorChar == '\\' ? 
                 ApacheSchemaConstants.WINDOWS_FILE_AT : 
                 ApacheSchemaConstants.UNIX_FILE_AT;
 
-        return  new DN( fileSep + 
+        return  new Dn( fileSep +
                 "=" + 
                 Strings.dumpHexPairs( Strings.getBytesUtf8(getCanonical(ldif)) ) +
                 "," + 
@@ -393,7 +393,7 @@ public class ApacheDS
         }
 
 
-        DN dn = new DN( ServerDNConstants.ADMIN_SYSTEM_DN, directoryService.getSchemaManager() );
+        Dn dn = new Dn( ServerDNConstants.ADMIN_SYSTEM_DN, directoryService.getSchemaManager() );
         
         ensureLdifFileBase();
 
@@ -502,7 +502,7 @@ public class ApacheDS
 
         // We have to load the schema now, otherwise we won't be able
         // to initialize the Partitions, as we won't be able to parse 
-        // and normalize their suffix DN
+        // and normalize their suffix Dn
         schemaManager.loadAllEnabled();
         
         schemaPartition.setSchemaManager( schemaManager );

Modified: directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java (original)
+++ directory/apacheds/trunk/server-jndi/src/test/java/org/apache/directory/server/configuration/ApacheDSTest.java Sun Jan 23 01:17:06 2011
@@ -53,7 +53,7 @@ public class ApacheDSTest
         JdbmPartition example = new JdbmPartition();
         example.setId( "example" );
         example.setSuffix( "dc=example,dc=com" );
-        DN contextDn = new DN( "dc=example,dc=com" );
+        Dn contextDn = new Dn( "dc=example,dc=com" );
         contextDn.normalize( directoryService.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
         ServerEntry contextEntry = new DefaultServerEntry( directoryService.getRegistries(), contextDn );
         contextEntry.add( "objectClass", "top", "domain" );
@@ -82,7 +82,7 @@ public class ApacheDSTest
             LOG.error( "Failed to start up ApacheDS!", t );
         }
         
-        DN dn = new DN( "uid=aeinstein,ou=Users,dc=example,dc=com" );
+        Dn dn = new Dn( "uid=aeinstein,ou=Users,dc=example,dc=com" );
         assertNotNull( directoryService.getAdminSession().lookup( dn ) );
     }
     */

Modified: directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java (original)
+++ directory/apacheds/trunk/server-replication/src/main/java/org/apache/directory/server/replication/configuration/ReplicationAgreement.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.repl
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 
 
@@ -79,7 +79,7 @@ public class ReplicationAgreement
     /**
      * The administrative point for the replication specific autonomous area.
      */
-    DN replicationBase;
+    Dn replicationBase;
     
     /**
      * The schedule to use for initiating replication cycles.  You can have more than

Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java (original)
+++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/ServiceBuilder.java Sun Jan 23 01:17:06 2011
@@ -134,7 +134,7 @@ public class ServiceBuilder
     /**
      * Creates the Interceptor instances from the configuration
      *
-     * @param dirServiceDN the DN under which interceptors are configured
+     * @param dirServiceDN the Dn under which interceptors are configured
      * @return a list of instantiated Interceptor objects
      * @throws Exception If the instanciation failed
      */
@@ -1054,7 +1054,7 @@ public class ServiceBuilder
         }
         catch ( LdapInvalidDnException lide )
         {
-            String message = "Cannot set the DN " + jdbmPartitionBean.getPartitionSuffix() + ", " + lide.getMessage();
+            String message = "Cannot set the Dn " + jdbmPartitionBean.getPartitionSuffix() + ", " + lide.getMessage();
             LOG.error( message );
             throw new ConfigurationException( message );
         }

Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java Sun Jan 23 01:17:06 2011
@@ -62,7 +62,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -216,7 +216,7 @@ public class ApacheDsService
 
         // We have to load the schema now, otherwise we won't be able
         // to initialize the Partitions, as we won't be able to parse 
-        // and normalize their suffix DN
+        // and normalize their suffix Dn
         schemaManager.loadAllEnabled();
 
         List<Throwable> errors = schemaManager.getErrors();
@@ -252,7 +252,7 @@ public class ApacheDsService
         configPartition = new SingleFileLdifPartition();
         configPartition.setId( "config" );
         configPartition.setPartitionPath( confFile.toURI() );
-        configPartition.setSuffix( new DN( "ou=config", schemaManager ) );
+        configPartition.setSuffix( new Dn( "ou=config", schemaManager ) );
         configPartition.setSchemaManager( schemaManager );
 
         configPartition.initialize();
@@ -671,7 +671,7 @@ public class ApacheDsService
             EntryAttribute creatorAt = entry.get( atType );
             String creator = ( creatorAt == null ? "" : creatorAt.getString().trim() );
 
-            if ( ( creator.length() == 0 ) || ( !DN.isValid( creator ) ) )
+            if ( ( creator.length() == 0 ) || ( !Dn.isValid(creator) ) )
             {
                 creatorAt = new DefaultEntryAttribute( atType, adminDn );
             }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTru
 
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -59,11 +59,11 @@ public class TestClassA extends Abstract
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         }
         
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testMethodA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) );
     }
 
 
@@ -79,12 +79,12 @@ public class TestClassA extends Abstract
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassA2,ou=system" ) ) );
-        assertFalse( service.getAdminSession().exists( new DN( "cn=testMethodA,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testMethodWithApplyLdif,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testClassA2,ou=system" ) ) );
+        assertFalse( service.getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testMethodWithApplyLdif,ou=system" ) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTru
 
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -44,10 +44,10 @@ public class TestClassB extends Abstract
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) );
     }
     
     
@@ -57,12 +57,12 @@ public class TestClassB extends Abstract
         // this assertion will only work if ran as part of TestSuite
         // commenting this to make maven report test success, uncomment in an IDE
         // while running the TestSuite
-        // assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+        // assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java Sun Jan 23 01:17:06 2011
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -35,14 +35,14 @@ public class TestClassC extends Abstract
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) );
         }
 
-        assertFalse( service.getAdminSession().exists( new DN( "cn=testClassC,ou=system" ) ) );
+        assertFalse( service.getAdminSession().exists( new Dn( "cn=testClassC,ou=system" ) ) );
         
-        // the below DN will be injected in TestClassB when ran as suite, but that DN
+        // the below Dn will be injected in TestClassB when ran as suite, but that Dn
         // shouldn't be present in the suite level DS cause of revert operation
-        assertFalse( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system" ) ) );
+        assertFalse( service.getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) );
     }
     
     
@@ -50,7 +50,7 @@ public class TestClassC extends Abstract
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system" ) ) );
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson1,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson2,ou=system" ) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java Sun Jan 23 01:17:06 2011
@@ -21,7 +21,7 @@ package org.apache.directory.server.core
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -32,13 +32,13 @@ public class TestClassServer extends Abs
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson1,ou=system" ) ) );
         
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "dc=example,dc=com" ) ) );
         }
         
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson2,ou=system" ) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java (original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Sun Jan 23 01:17:06 2011
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTru
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,11 +41,11 @@ public class TestWithClassLevelLdapServe
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson1,ou=system" ) ) );
         
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) ) );
+            assertTrue( service.getAdminSession().exists( new Dn( "dc=example,dc=com" ) ) );
             // the SuiteDS is the name given to the DS instance in the enclosing TestSuite
             assertEquals( "SuiteDS", ldapServer.getDirectoryService().getInstanceId() );
         }
@@ -54,7 +54,7 @@ public class TestWithClassLevelLdapServe
             assertTrue( ldapServer.getDirectoryService().getInstanceId().startsWith( "default" ) ); // after 'default' a UUID follows
         }
         
-        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system" ) ) );
+        assertTrue( service.getAdminSession().exists( new Dn( "cn=testPerson2,ou=system" ) ) );
         
         assertNotNull( ldapServer );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 
 
 /**
@@ -105,7 +105,7 @@ public class AvlPartition extends Abstra
     }
 
 
-    public final void modify( DN dn, List<Modification> modifications ) throws LdapException
+    public final void modify( Dn dn, List<Modification> modifications ) throws LdapException
     {
         try
         {

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sun Jan 23 01:17:06 2011
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
 
@@ -78,8 +78,8 @@ public abstract class BTreePartition<ID>
     /** The Entry cache size for this partition */
     protected int cacheSize = -1;
     
-    /** The root DN for this partition */
-    protected DN suffix;
+    /** The root Dn for this partition */
+    protected Dn suffix;
     
     /** The path in which this Partition stores files */
     protected URI partitionPath;
@@ -223,7 +223,7 @@ public abstract class BTreePartition<ID>
      */
     public void delete( DeleteOperationContext deleteContext ) throws LdapException
     {
-        DN dn = deleteContext.getDn();
+        Dn dn = deleteContext.getDn();
 
         ID id = getEntryId( dn );
 
@@ -263,7 +263,7 @@ public abstract class BTreePartition<ID>
         {
             SearchControls searchCtls = searchContext.getSearchControls();
             IndexCursor<ID, Entry, ID> underlying;
-            DN dn = searchContext.getDn();
+            Dn dn = searchContext.getDn();
             AliasDerefMode derefMode = searchContext.getAliasDerefMode();
             ExprNode filter = searchContext.getFilter();
 
@@ -406,7 +406,7 @@ public abstract class BTreePartition<ID>
     /**
      * {@inheritDoc}
      */
-    public void setSuffix( DN suffix ) throws LdapInvalidDnException
+    public void setSuffix( Dn suffix ) throws LdapInvalidDnException
     {
         this.suffix = suffix;
 
@@ -420,7 +420,7 @@ public abstract class BTreePartition<ID>
     /**
      * {@inheritDoc}
      */
-    public DN getSuffix()
+    public Dn getSuffix()
     {
         return suffix;
     }
@@ -432,10 +432,10 @@ public abstract class BTreePartition<ID>
     public abstract Index<? extends Object, Entry, ID> getSystemIndex( AttributeType attributeType ) throws Exception;
 
 
-    public abstract ID getEntryId( DN dn ) throws LdapException;
+    public abstract ID getEntryId( Dn dn ) throws LdapException;
 
 
-    public abstract DN getEntryDn( ID id ) throws Exception;
+    public abstract Dn getEntryDn( ID id ) throws Exception;
 
 
     public abstract ClonedServerEntry lookup( ID id ) throws LdapException;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/xdbm/AbstractXdbmPartition.java Sun Jan 23 01:17:06 2011
@@ -43,8 +43,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapOperationErrorException;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 
 
@@ -228,7 +228,7 @@ public abstract class AbstractXdbmPartit
     /**
      * {@inheritDoc}
      */
-    public final ID getEntryId( DN dn ) throws LdapException
+    public final ID getEntryId( Dn dn ) throws LdapException
     {
         try
         {
@@ -244,7 +244,7 @@ public abstract class AbstractXdbmPartit
     /**
      * {@inheritDoc}
      */
-    public final DN getEntryDn( ID id ) throws Exception
+    public final Dn getEntryDn( ID id ) throws Exception
     {
         return store.getEntryDn( id );
     }
@@ -381,8 +381,8 @@ public abstract class AbstractXdbmPartit
     {
         try
         {
-            DN oldDn = renameContext.getDn();
-            RDN newRdn = renameContext.getNewRdn();
+            Dn oldDn = renameContext.getDn();
+            Rdn newRdn = renameContext.getNewRdn();
             boolean deleteOldRdn = renameContext.getDeleteOldRdn();
 
             if ( renameContext.getEntry() != null )
@@ -415,9 +415,9 @@ public abstract class AbstractXdbmPartit
 
         try
         {
-            DN oldDn = moveAndRenameContext.getDn();
-            DN newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
-            RDN newRdn = moveAndRenameContext.getNewRdn();
+            Dn oldDn = moveAndRenameContext.getDn();
+            Dn newSuperiorDn = moveAndRenameContext.getNewSuperiorDn();
+            Rdn newRdn = moveAndRenameContext.getNewRdn();
             boolean deleteOldRdn = moveAndRenameContext.getDeleteOldRdn();
             Entry modifiedEntry = moveAndRenameContext.getModifiedEntry();
             
@@ -449,9 +449,9 @@ public abstract class AbstractXdbmPartit
 
         try
         {
-            DN oldDn = moveContext.getDn();
-            DN newSuperior = moveContext.getNewSuperior();
-            DN newDn = moveContext.getNewDn();
+            Dn oldDn = moveContext.getDn();
+            Dn newSuperior = moveContext.getNewSuperior();
+            Dn newDn = moveContext.getNewDn();
             Entry modifiedEntry = moveContext.getModifiedEntry();
             
             store.move( oldDn, newSuperior, newDn, modifiedEntry );
@@ -463,7 +463,7 @@ public abstract class AbstractXdbmPartit
     }
 
 
-    public final void bind( DN bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId )
+    public final void bind( Dn bindDn, byte[] credentials, List<String> mechanisms, String saslAuthId )
         throws LdapException
     {
         // does nothing



Mime
View raw message