directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1062306 [5/32] - in /directory: apacheds-manuals/trunk/src/advanced-user-guide/ apacheds-manuals/trunk/src/basic-user-guide/ apacheds/trunk/core-annotations/src/main/java/org/apache/directory/server/core/factory/ apacheds/trunk/core-api/sr...
Date Sun, 23 Jan 2011 01:17:26 GMT
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Sun Jan 23 01:17:06 2011
@@ -53,8 +53,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.ChangeType;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
-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.registries.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -99,7 +99,7 @@ public class IntegrationUtils
 
 
     /**
-     * Inject an ldif String into the server. DN must be relative to the
+     * Inject an ldif String into the server. Dn must be relative to the
      * root.
      *
      * @param service the directory service to use
@@ -150,7 +150,7 @@ public class IntegrationUtils
             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 )
@@ -172,7 +172,7 @@ public class IntegrationUtils
             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 )
@@ -205,7 +205,7 @@ public class IntegrationUtils
 
     public static void apply( DirectoryService service, LdifEntry entry ) throws Exception
     {
-        DN dn = new DN( entry.getDn() );
+        Dn dn = new Dn( entry.getDn() );
         CoreSession session = service.getAdminSession();
 
         switch( entry.getChangeType().getChangeType() )
@@ -221,14 +221,14 @@ public class IntegrationUtils
 
             case( ChangeType.MODDN_ORDINAL ):
             case( ChangeType.MODRDN_ORDINAL ):
-                RDN newRdn = new RDN( entry.getNewRdn() );
+                Rdn newRdn = new Rdn( entry.getNewRdn() );
 
                 if ( entry.getNewSuperior() != null )
                 {
                     // It's a move. The superior have changed
                     // Let's see if it's a rename too
-                    RDN oldRdn = dn.getRdn();
-                    DN newSuperior = new DN( entry.getNewSuperior() );
+                    Rdn oldRdn = dn.getRdn();
+                    Dn newSuperior = new Dn( entry.getNewSuperior() );
 
                     if ( dn.size() == 0 )
                     {
@@ -266,7 +266,7 @@ public class IntegrationUtils
     public static LdifEntry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
             throws LdapException
     {
-        DN dn = new DN( dnstr );
+        Dn dn = new Dn( dnstr );
         LdifEntry ldif = new LdifEntry();
         ldif.setDn( dnstr );
         ldif.setChangeType( ChangeType.Add );
@@ -359,7 +359,7 @@ public class IntegrationUtils
 
 
     /**
-     * gets a LdapConnection bound using the default admin DN uid=admin,ou=system and password "secret"
+     * gets a LdapConnection bound using the default admin Dn uid=admin,ou=system and password "secret"
      */
     public static LdapConnection getAdminConnection( DirectoryService dirService ) throws Exception
     {
@@ -369,11 +369,11 @@ public class IntegrationUtils
 
     public static LdapConnection getConnectionAs( DirectoryService dirService, String dn, String password ) throws Exception
     {
-        return getConnectionAs( dirService, new DN( dn ), password );
+        return getConnectionAs( dirService, new Dn( dn ), password );
     }
 
 
-    public static LdapConnection getConnectionAs( DirectoryService dirService, DN dn, String password ) throws Exception
+    public static LdapConnection getConnectionAs( DirectoryService dirService, Dn dn, String password ) throws Exception
     {
         Object connectionObj = LdapConnectionFactory.getCoreSessionConnection();
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,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.apache.directory.shared.util.Strings;
 import org.junit.After;
 import org.junit.Test;
@@ -203,7 +203,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "newpwd" );
         connection.modify( modReq );
 
@@ -254,7 +254,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'secret', encrypted using SHA
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{SHA}5en6G6MezRroT3XKqkdPOmY/BfQ=" );
         connection.modify( modReq );
 
@@ -296,7 +296,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'secret', encrypted using SHA
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{SSHA}mjVVxasFkk59wMW4L1Ldt+YCblfhULHs03WW7g==" );
         connection.modify( modReq );
 
@@ -336,7 +336,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'test123', encrypted using SHA with a 4 bytes salt
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{SSHA}0TT388zsWzHKtMEpIU/8/W68egchNEWp" );
         connection.modify( modReq );
 
@@ -376,7 +376,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'secret', encrypted using MD5
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
         connection.modify( modReq );
 
@@ -417,7 +417,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'secret', encrypted using SMD5
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
         connection.modify( modReq );
 
@@ -457,7 +457,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu : 'secret', encrypted using CRYPT
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "{crypt}qFkH8Z1woBlXw" );
         connection.modify( modReq );
 
@@ -498,7 +498,7 @@ public class SimpleAuthenticationIT exte
 
         // now modify the password for akarasulu (while we're admin)
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( userDn ) );
+        modReq.setName( new Dn( userDn ) );
         modReq.replace( "userPassword", "newpwd" );
         connection.modify( modReq );
         connection.close();

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sun Jan 23 01:17:06 2011
@@ -61,7 +61,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -126,7 +126,7 @@ public class PasswordPolicyTest extends 
     {
         LdapConnection connection = getAdminNetworkConnection( ldapServer );
         
-        DN userDn = new DN( "cn=user,ou=system" );
+        Dn userDn = new Dn( "cn=user,ou=system" );
         Entry userEntry = LdifUtils.createEntry( userDn, "ObjectClass: top", "ObjectClass: person", "cn: user",
             "sn: user_sn", "userPassword: 1234" );
 
@@ -163,7 +163,7 @@ public class PasswordPolicyTest extends 
 
         byte[] password = PasswordUtil.createStoragePassword( "12345", LdapSecurityConstants.HASH_METHOD_CRYPT );
 
-        DN userDn = new DN( "cn=hashedpwd,ou=system" );
+        Dn userDn = new Dn( "cn=hashedpwd,ou=system" );
         Entry userEntry = new DefaultEntry( userDn );
         userEntry.add( SchemaConstants.OBJECT_CLASS, SchemaConstants.PERSON_OC );
         userEntry.add( SchemaConstants.CN_AT, "hashedpwd" );
@@ -204,7 +204,7 @@ public class PasswordPolicyTest extends 
 
         LdapConnection connection = getAdminNetworkConnection( ldapServer );
 
-        DN userDn = new DN( "cn=userMinAge,ou=system" );
+        Dn userDn = new Dn( "cn=userMinAge,ou=system" );
         Entry userEntry = LdifUtils.createEntry( userDn, "ObjectClass: top", "ObjectClass: person", "cn: userMinAge",
             "sn: userMinAge_sn", "userPassword: 12345" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.AddResponse;
 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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,7 +70,7 @@ public class AddAuthorizationIT extends 
 
     /**
      * Checks if a simple entry (organizationalUnit) can be added to the DIT at an
-     * RDN relative to ou=system by a specific non-admin user.  If a permission exception
+     * Rdn relative to ou=system by a specific non-admin user.  If a permission exception
      * is encountered it is caught and false is returned, otherwise true is returned
      * when the entry is created.  The entry is deleted after being created just in case
      * subsequent calls to this method do not fail: the admin account is used to delete
@@ -78,7 +78,7 @@ public class AddAuthorizationIT extends 
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry creation is tested
+     * @param entryRdn the relative Dn, relative to ou=system where entry creation is tested
      * @return true if the entry can be created by the user at the specified location, false otherwise
      * @throws Exception if there are problems conducting the test
      */
@@ -88,10 +88,10 @@ public class AddAuthorizationIT extends 
 
         try
         {
-            DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+            Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
             connection = getConnectionAs( userName, password );
 
-            Entry entry = new DefaultEntry( new DN( "ou=system" ).add( entryRdn ) );
+            Entry entry = new DefaultEntry( new Dn( "ou=system" ).add( entryRdn ) );
             entry.add( "ou", "testou" );
             entry.add( "ObjectClass", "top", "organizationalUnit" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java Sun Jan 23 01:17:06 2011
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 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.Test;
@@ -90,7 +90,7 @@ public class AdministratorsGroupIT exten
     @CreateDS(enableAccessControl = true, name = "testNonAdminReadAccessToGroups-method")
     public void testNonAdminReadAccessToGroups() throws Exception
     {
-        DN billydDn = createUser( "billyd", "s3kr3t" );
+        Dn billydDn = createUser( "billyd", "s3kr3t" );
 
         // this should fail with a no permission exception because we
         // are not allowed to browse ou=system without an ACI 
@@ -118,7 +118,7 @@ public class AdministratorsGroupIT exten
     @CreateDS(name = "testDefaultNonAdminReadAccessToGroups-method")
     public void testDefaultNonAdminReadAccessToGroups() throws Exception
     {
-        DN billydDn = createUser( "billyd", "s3kr3t" );
+        Dn billydDn = createUser( "billyd", "s3kr3t" );
         assertFalse( service.isAccessControlEnabled() );
         LdapConnection connection = getConnectionAs( billydDn, "s3kr3t" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Sun Jan 23 01:17:06 2011
@@ -44,8 +44,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
+import org.apache.directory.shared.ldap.name.Dn;
+import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.util.Strings;
 import org.junit.After;
 import org.junit.Before;
@@ -99,7 +99,7 @@ public class AuthorizationServiceAsAdmin
     @Test
     public void testNoRdnChangesOnAdminByAdmin() throws Exception
     {
-        ModifyDnResponse resp = getAdminConnection().rename( new DN( "uid=admin,ou=system" ), new RDN( "uid=alex" ) );
+        ModifyDnResponse resp = getAdminConnection().rename( new Dn( "uid=admin,ou=system" ), new Rdn( "uid=alex" ) );
         assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, resp.getLdapResult().getResultCode() );
     }
 
@@ -113,7 +113,7 @@ public class AuthorizationServiceAsAdmin
     public void testModifyOnAdminByAdmin() throws Exception
     {
         LdapConnection connection = getAdminConnection();
-        DN adminDn = new DN( "uid=admin,ou=system" );
+        Dn adminDn = new Dn( "uid=admin,ou=system" );
         ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( adminDn );
         String newPwd = "replaced";

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Sun Jan 23 01:17:06 2011
@@ -48,8 +48,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -80,7 +80,7 @@ public class AuthorizationServiceAsNonAd
 
         try
         {
-            service.getAdminSession().delete( new DN( "uid=admin,ou=system") ); 
+            service.getAdminSession().delete( new Dn( "uid=admin,ou=system") );
             fail( "User 'admin' should not be able to delete his account" );
         }
         catch ( LdapNoPermissionException e )
@@ -106,8 +106,8 @@ public class AuthorizationServiceAsNonAd
         try
         {
             service.getAdminSession().rename( 
-                new DN( "uid=admin,ou=system" ), 
-                new RDN( "uid=alex" ),
+                new Dn( "uid=admin,ou=system" ),
+                new Rdn( "uid=alex" ),
                 false );
             fail( "admin should not be able to rename his account" );
         }
@@ -143,14 +143,14 @@ public class AuthorizationServiceAsNonAd
         Modification mod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
         mods.add( mod );
       
-        DN userDn = new DN( "uid=akarasulu,ou=users,ou=system", service.getSchemaManager() );
+        Dn userDn = new Dn( "uid=akarasulu,ou=users,ou=system", service.getSchemaManager() );
         LdapPrincipal principal = new LdapPrincipal( userDn, AuthenticationLevel.SIMPLE );
         CoreSession akarasuluSession = service.getSession( principal );
 
         try
         {
             akarasuluSession.modify( 
-                new DN( "uid=admin,ou=system" ), mods ); 
+                new Dn( "uid=admin,ou=system" ), mods );
             fail( "User 'uid=admin,ou=system' should not be able to modify attributes on admin" );
         }
         catch ( Exception e )
@@ -175,7 +175,7 @@ public class AuthorizationServiceAsNonAd
         try
         {
             ExprNode filter = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
-            service.getAdminSession().search( new DN( "ou=system" ), SearchScope.SUBTREE, filter , AliasDerefMode.DEREF_ALWAYS, null );
+            service.getAdminSession().search( new Dn( "ou=system" ), SearchScope.SUBTREE, filter , AliasDerefMode.DEREF_ALWAYS, null );
         }
         catch ( LdapNoPermissionException e )
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Sun Jan 23 01:17:06 2011
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
 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.Ignore;
@@ -77,7 +77,7 @@ public class AuthzAuthnIT extends Abstra
     {
         createUser( "billyd", "billyd" );
 
-        DN userName = new DN( "uid=billyd,ou=users,ou=system" );
+        Dn userName = new Dn( "uid=billyd,ou=users,ou=system" );
         // Authenticate to RootDSE
         LdapConnection connection = getConnectionAs( userName, "billyd" );
         Entry entry = connection.lookup( "" );
@@ -97,7 +97,7 @@ public class AuthzAuthnIT extends Abstra
     {
         createUser( "billyd", "billyd" );
 
-        DN userName = new DN( "uid=billyd,ou=users,ou=system" );
+        Dn userName = new Dn( "uid=billyd,ou=users,ou=system" );
         LdapConnection connection = getConnectionAs( userName, "billyd" );
         Entry entry = connection.lookup( "ou=system" );
         assertNull( entry );
@@ -140,7 +140,7 @@ public class AuthzAuthnIT extends Abstra
             "  } " + 
             "}" );
 
-        DN userName = new DN( "uid=billyd,ou=users,ou=system" );
+        Dn userName = new Dn( "uid=billyd,ou=users,ou=system" );
 
         LdapConnection connection = getConnectionAs( userName, "billyd" );
         Entry entry = connection.lookup( "ou=system" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,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;
 
 
 /**
@@ -49,7 +49,7 @@ public class AutzIntegUtils
     // -----------------------------------------------------------------------
 
     /**
-     * gets a LdapConnection bound using the default admin DN uid=admin,ou=system and password "secret"
+     * gets a LdapConnection bound using the default admin Dn uid=admin,ou=system and password "secret"
      */
     public static LdapConnection getAdminConnection() throws Exception
     {
@@ -63,7 +63,7 @@ public class AutzIntegUtils
     }
 
 
-    public static LdapConnection getConnectionAs( DN dn, String password ) throws Exception
+    public static LdapConnection getConnectionAs( Dn dn, String password ) throws Exception
     {
         return IntegrationUtils.getConnectionAs( service, dn.getName(), password );
     }
@@ -79,30 +79,30 @@ public class AutzIntegUtils
      * Creates a group using the groupOfUniqueNames objectClass under the
      * ou=groups,ou=sytem container with an initial member.
      *
-     * @param cn the common name of the group used as the RDN attribute
-     * @param firstMemberDn the DN of the first member of this group
+     * @param cn the common name of the group used as the Rdn attribute
+     * @param firstMemberDn the Dn of the first member of this group
      * @return the distinguished name of the group entry
      * @throws Exception if there are problems creating the new group like
      * it exists already
      */
-    public static DN createGroup( String cn, String firstMemberDn ) throws Exception
+    public static Dn createGroup( String cn, String firstMemberDn ) throws Exception
     {
-        DN groupDN = new DN( "cn=" + cn + ",ou=groups,ou=system" );
-        Entry entry = new DefaultEntry( groupDN );
+        Dn groupDn = new Dn( "cn=" + cn + ",ou=groups,ou=system" );
+        Entry entry = new DefaultEntry(groupDn);
         entry.add( "ObjectClass", "groupOfUniqueNames" );
         entry.add( "uniqueMember", firstMemberDn );
         entry.add( "cn", cn );
 
         getAdminConnection().add( entry );
 
-        return groupDN;
+        return groupDn;
     }
 
 
     /**
      * Deletes a user with a specific UID under ou=users,ou=system.
      *
-     * @param uid the RDN value for the user to delete
+     * @param uid the Rdn value for the user to delete
      * @throws Exception if there are problems removing the user
      * i.e. user does not exist
      */
@@ -114,19 +114,19 @@ public class AutzIntegUtils
 
     /**
      * Creates a simple user as an inetOrgPerson under the ou=users,ou=system
-     * container.  The user's RDN attribute is the uid argument.  This argument
+     * container.  The user's Rdn attribute is the uid argument.  This argument
      * is also used as the value of the two MUST attributes: sn and cn.
      *
-     * @param uid the value of the RDN attriubte (uid), the sn and cn attributes
+     * @param uid the value of the Rdn attriubte (uid), the sn and cn attributes
      * @param password the password to use to create the user
      * @return the dn of the newly created user entry
      * @throws Exception if there are problems creating the user entry
      */
-    public static DN createUser( String uid, String password ) throws Exception
+    public static Dn createUser( String uid, String password ) throws Exception
     {
         LdapConnection connection = getAdminConnection();
 
-        Entry entry = new DefaultEntry( new DN( "uid=" + uid + ",ou=users,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "uid=" + uid + ",ou=users,ou=system" ) );
         entry.add( "uid", uid );
         entry.add( "objectClass", "top", "person", "organizationalPerson", "inetOrgPerson" );
         entry.add( "sn", uid );
@@ -145,14 +145,14 @@ public class AutzIntegUtils
      * group.
      *
      * @param groupName the name of the cgroup to create
-     * @return the DN of the group as a Name object
+     * @return the Dn of the group as a Name object
      * @throws Exception if the group cannot be created
      */
-    public static DN createGroup( String groupName ) throws Exception
+    public static Dn createGroup( String groupName ) throws Exception
     {
-        DN groupDN = new DN( "cn=" + groupName + ",ou=groups,ou=system" );
+        Dn groupDn = new Dn( "cn=" + groupName + ",ou=groups,ou=system" );
 
-        Entry entry = new DefaultEntry( groupDN );
+        Entry entry = new DefaultEntry(groupDn);
         entry.add( "objectClass", "top", "groupOfUniqueNames" );
         // TODO might be ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED
         entry.add( "uniqueMember", "uid=admin, ou=system" );
@@ -160,7 +160,7 @@ public class AutzIntegUtils
 
         getAdminConnection().add( entry );
 
-        return groupDN;
+        return groupDn;
     }
 
 
@@ -177,7 +177,7 @@ public class AutzIntegUtils
         LdapConnection connection = getAdminConnection();
 
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( "cn=" + groupCn + ",ou=groups,ou=system" ) );
+        modReq.setName( new Dn( "cn=" + groupCn + ",ou=groups,ou=system" ) );
         modReq.add( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system" );
 
         connection.modify( modReq ).getLdapResult().getResultCode();
@@ -187,14 +187,14 @@ public class AutzIntegUtils
     /**
      * Removes a user from a group.
      *
-     * @param userUid the RDN attribute value of the user to remove from the group
-     * @param groupCn the RDN attribute value of the group to have user removed from
+     * @param userUid the Rdn attribute value of the user to remove from the group
+     * @param groupCn the Rdn attribute value of the group to have user removed from
      * @throws Exception if there are problems accessing the group
      */
     public static void removeUserFromGroup( String userUid, String groupCn ) throws Exception
     {
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( "cn=" + groupCn + ",ou=groups,ou=system" ) );
+        modReq.setName( new Dn( "cn=" + groupCn + ",ou=groups,ou=system" ) );
         modReq.remove( "uniqueMember", "uid=" + userUid + ",ou=users,ou=system" );
         getAdminConnection().modify( modReq );
     }
@@ -248,7 +248,7 @@ public class AutzIntegUtils
         }
 
         // now add the A/C subentry below ou=system
-        Entry subEntry = new DefaultEntry( new DN( "cn=" + cn + ",ou=system" ) );
+        Entry subEntry = new DefaultEntry( new Dn( "cn=" + cn + ",ou=system" ) );
         subEntry.add( "objectClass", "top", "subentry", "accessControlSubentry" );
         subEntry.add( "subtreeSpecification", subtree );
         subEntry.add( "prescriptiveACI", aciItem );
@@ -267,7 +267,7 @@ public class AutzIntegUtils
      * @param aciItem the entryACI attribute value
      * @throws Exception if there is a problem adding the attribute
      */
-    public static void addEntryACI( DN dn, String aciItem ) throws Exception
+    public static void addEntryACI( Dn dn, String aciItem ) throws Exception
     {
         // modify the entry relative to ou=system to include the aciItem
         ModifyRequest modReq = new ModifyRequestImpl();
@@ -288,7 +288,7 @@ public class AutzIntegUtils
     {
         // modify the entry relative to ou=system to include the aciItem
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( "ou=system" ) );
+        modReq.setName( new Dn( "ou=system" ) );
         modReq.add( "subentryACI", aciItem );
         getAdminConnection().modify( modReq );
     }
@@ -305,7 +305,7 @@ public class AutzIntegUtils
     public static void changePresciptiveACI( String cn, String aciItem ) throws Exception
     {
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( "cn=" + cn + ",ou=system" ) );
+        modReq.setName( new Dn( "cn=" + cn + ",ou=system" ) );
         modReq.replace( "prescriptiveACI", aciItem );
         getAdminConnection().modify( modReq );
     }
@@ -314,7 +314,7 @@ public class AutzIntegUtils
     public static void addPrescriptiveACI( String cn, String aciItem ) throws Exception
     {
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( new DN( "cn=" + cn + ",ou=system" ) );
+        modReq.setName( new Dn( "cn=" + cn + ",ou=system" ) );
         modReq.add( "prescriptiveACI", aciItem );
         getAdminConnection().modify( modReq );
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.CompareResponse;
 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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -72,7 +72,7 @@ public class CompareAuthorizationIT exte
 
     /**
      * Checks if an attribute of a simple entry (an organizationalUnit's telephoneNumber)
-     * with an RDN relative to ou=system can be compared by a specific non-admin user.
+     * with an Rdn relative to ou=system can be compared by a specific non-admin user.
      * If a permission exception is encountered it is caught and false is returned,
      * otherwise true is returned.  The entry is deleted after being created just in case
      * subsequent calls to this method are made in the same test case: the admin account
@@ -81,7 +81,7 @@ public class CompareAuthorizationIT exte
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry is created
+     * @param entryRdn the relative Dn, relative to ou=system where entry is created
      * for comparison test
      * @param number the telephone number to compare to this one
      * @return true if the entry's telephoneNumber can be compared by the user at the
@@ -93,11 +93,11 @@ public class CompareAuthorizationIT exte
         throws Exception
     {
 
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result = true;
 
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -107,10 +107,10 @@ public class CompareAuthorizationIT exte
         // create the entry as admin
         adminConnection.add( testEntry );
 
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
         // compare the telephone numbers
         LdapConnection userConnection = getConnectionAs( userName, password );
-        CompareResponse resp = userConnection.compare( entryDN, "telephoneNumber", number );
+        CompareResponse resp = userConnection.compare(entryDn, "telephoneNumber", number );
 
         // don't set based on compare result success/failure but based on whether the op was permitted or not
         if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS )
@@ -248,8 +248,8 @@ public class CompareAuthorizationIT exte
     {
         LdapConnection adminCtx = getAdminConnection();
 
-        DN userDN = new DN( "uid=bob,ou=users,ou=system" );
-        Entry user = new DefaultEntry( userDN );
+        Dn userDn = new Dn( "uid=bob,ou=users,ou=system" );
+        Entry user = new DefaultEntry(userDn);
         user.add( SchemaConstants.UID_AT, "bob" );
         user.add( SchemaConstants.USER_PASSWORD_AT, "bobspassword" );
         user.add( SchemaConstants.OBJECT_CLASS_AT, "person", "organizationalPerson", "inetOrgPerson" );
@@ -258,7 +258,7 @@ public class CompareAuthorizationIT exte
 
         adminCtx.add( user );
 
-        CompareResponse resp = adminCtx.compare( userDN, "userPassword", "bobspassword" );
+        CompareResponse resp = adminCtx.compare(userDn, "userPassword", "bobspassword" );
         assertEquals( ResultCodeEnum.COMPARE_TRUE, resp.getLdapResult().getResultCode() );
     }
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.DeleteResponse;
 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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +71,7 @@ public class DeleteAuthorizationIT exten
 
     /**
      * Checks if a simple entry (organizationalUnit) can be deleted from the DIT at an
-     * RDN relative to ou=system by a specific non-admin user.  The entry is first
+     * Rdn relative to ou=system by a specific non-admin user.  The entry is first
      * created using the admin account which can do anything without limitations.
      * After creating the entry as the admin an attempt is made to delete it as the
      * specified user.
@@ -84,16 +84,16 @@ public class DeleteAuthorizationIT exten
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry creation then deletion is tested
+     * @param entryRdn the relative Dn, relative to ou=system where entry creation then deletion is tested
      * @return true if the entry can be created by the user at the specified location, false otherwise
      * @throws Exception if there are problems conducting the test
      */
     public boolean checkCanDeleteEntryAs( String uid, String password, String entryRdn ) throws Exception
     {
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
 
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
 
@@ -102,11 +102,11 @@ public class DeleteAuthorizationIT exten
         // create the entry as admin
         adminConnection.add( testEntry );
 
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
 
         // delete the newly created context as the user
         LdapConnection userConnection = getConnectionAs( userName, password );
-        DeleteResponse resp = userConnection.delete( entryDN );
+        DeleteResponse resp = userConnection.delete(entryDn);
 
         if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -114,7 +114,7 @@ public class DeleteAuthorizationIT exten
         }
         else
         {
-            adminConnection.delete( entryDN );
+            adminConnection.delete(entryDn);
             return false;
         }
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -61,13 +61,13 @@ public class LookupAuthorizationIT exten
 
     
     /**
-     * Test a lookup( DN ) operation with the ACI subsystem enabled
+     * Test a lookup( Dn ) operation with the ACI subsystem enabled
      */
     @Test
     public void testLookupACIEnabled() throws Exception
     {
         service.setAccessControlEnabled( true );
-        DN dn = new DN( "cn=test,ou=system" );
+        Dn dn = new Dn( "cn=test,ou=system" );
         
         try
         {      

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -48,7 +48,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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -80,7 +80,7 @@ public class ModifyAuthorizationIT exten
 
 
     /**
-     * Checks if an attribute of a simple entry (an organizationalUnit) with an RDN
+     * Checks if an attribute of a simple entry (an organizationalUnit) with an Rdn
      * relative to ou=system can be modified by a specific non-admin user.  If a
      * permission exception is encountered it is caught and false is returned,
      * otherwise true is returned.  The entry is deleted after being created just in case
@@ -90,7 +90,7 @@ public class ModifyAuthorizationIT exten
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry is created
+     * @param entryRdn the relative Dn, relative to ou=system where entry is created
      * for modification test
      * @param mods the modifications to make to the entry
      * @return true if the modifications can be made by the user at the specified location,
@@ -100,11 +100,11 @@ public class ModifyAuthorizationIT exten
     public boolean checkCanModifyAs( String uid, String password, String entryRdn, Modification[] mods )
         throws Exception
     {
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result;
 
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -114,13 +114,13 @@ public class ModifyAuthorizationIT exten
         // create the entry as admin
         adminConnection.add( testEntry );
 
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
         // compare the telephone numbers
         LdapConnection userConnection = getConnectionAs( userName, password );
 
         // modify the entry as the user
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( entryDN );
+        modReq.setName(entryDn);
 
         for ( Modification modification : mods )
         {
@@ -139,14 +139,14 @@ public class ModifyAuthorizationIT exten
         }
 
         // let's clean up
-        adminConnection.delete( entryDN );
+        adminConnection.delete(entryDn);
 
         return result;
     }
 
 
     /**
-     * Checks if an attribute of a simple entry (an organizationalUnit) with an RDN
+     * Checks if an attribute of a simple entry (an organizationalUnit) with an Rdn
      * relative to ou=system can be modified by a specific non-admin user.  If a
      * permission exception is encountered it is caught and false is returned,
      * otherwise true is returned.  The entry is deleted after being created just in case
@@ -156,7 +156,7 @@ public class ModifyAuthorizationIT exten
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry is created
+     * @param entryRdn the relative Dn, relative to ou=system where entry is created
      * for modification test
      * @param mods the attributes to modify in the entry
      * @param modOp the modification operation to use for all attributes
@@ -167,11 +167,11 @@ public class ModifyAuthorizationIT exten
     public boolean checkCanModifyAs( String uid, String password, String entryRdn, ModificationOperation modOp,
         EntryAttribute attr ) throws Exception
     {
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result;
 
         // create the entry with the telephoneNumber attribute to compare
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
         testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -181,11 +181,11 @@ public class ModifyAuthorizationIT exten
         adminConnection.add( testEntry );
 
         // create the entry as admin
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
         // modify the entry as the user
         LdapConnection userConnection = getConnectionAs( userName, password );
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( entryDN );
+        modReq.setName(entryDn);
         modReq.addModification( attr, modOp );
 
         ModifyResponse resp = userConnection.modify( modReq );
@@ -200,7 +200,7 @@ public class ModifyAuthorizationIT exten
         }
 
         // let's clean up
-        adminConnection.delete( entryDN );
+        adminConnection.delete(entryDn);
 
         return result;
     }
@@ -221,11 +221,11 @@ public class ModifyAuthorizationIT exten
     public boolean checkCanSelfModify( String uid, String password, Modification[] mods ) throws Exception
     {
         // modify the entry as the user
-        DN userDN = new DN( "uid=" + uid + ",ou=users,ou=system" );
-        LdapConnection connection = getConnectionAs( userDN, password );
+        Dn userDn = new Dn( "uid=" + uid + ",ou=users,ou=system" );
+        LdapConnection connection = getConnectionAs(userDn, password );
 
         ModifyRequest modReq = new ModifyRequestImpl();
-        modReq.setName( userDN );
+        modReq.setName(userDn);
 
         for ( Modification modification : mods )
         {

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.message.ModifyDnResponse;
 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.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -75,10 +75,10 @@ public class MoveRenameAuthorizationIT e
 
     public boolean checkCanRenameAs( String uid, String password, String entryRdn, String newNameRdn ) throws Exception
     {
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result;
 
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
 
@@ -87,10 +87,10 @@ public class MoveRenameAuthorizationIT e
         // create the new entry as the admin user
         adminConnection.add( testEntry );
 
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
 
         LdapConnection userConnection = getConnectionAs( userName, password );
-        ModifyDnResponse resp = userConnection.rename( entryDN.getName(), newNameRdn );
+        ModifyDnResponse resp = userConnection.rename( entryDn.getName(), newNameRdn );
 
         if ( resp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -99,7 +99,7 @@ public class MoveRenameAuthorizationIT e
         }
         else
         {
-            adminConnection.delete( entryDN );
+            adminConnection.delete(entryDn);
             result = false;
         }
 
@@ -108,7 +108,7 @@ public class MoveRenameAuthorizationIT e
 
 
     /**
-     * Checks if a simple entry (organizationalUnit) can be renamed at an RDN relative
+     * Checks if a simple entry (organizationalUnit) can be renamed at an Rdn relative
      * to ou=system by a specific non-admin user.  If a permission exception
      * is encountered it is caught and false is returned, otherwise true is returned
      * when the entry is created.  The entry is deleted after being created just in case
@@ -117,19 +117,19 @@ public class MoveRenameAuthorizationIT e
      *
      * @param uid the unique identifier for the user (presumed to exist under ou=users,ou=system)
      * @param password the password of this user
-     * @param entryRdn the relative DN, relative to ou=system where entry renames are tested
-     * @param newNameRdn the new RDN for the entry under ou=system
-     * @param newParentRdn the new parent RDN for the entry under ou=system
+     * @param entryRdn the relative Dn, relative to ou=system where entry renames are tested
+     * @param newNameRdn the new Rdn for the entry under ou=system
+     * @param newParentRdn the new parent Rdn for the entry under ou=system
      * @return true if the entry can be renamed by the user at the specified location, false otherwise
      * @throws Exception if there are problems conducting the test
      */
     public boolean checkCanMoveAndRenameAs( String uid, String password, String entryRdn, String newNameRdn,
         String newParentRdn ) throws Exception
     {
-        DN entryDN = new DN( entryRdn + ",ou=system" );
+        Dn entryDn = new Dn( entryRdn + ",ou=system" );
         boolean result;
 
-        Entry testEntry = new DefaultEntry( entryDN );
+        Entry testEntry = new DefaultEntry(entryDn);
         testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         testEntry.add( SchemaConstants.OU_AT, "testou" );
 
@@ -138,12 +138,12 @@ public class MoveRenameAuthorizationIT e
         // create the new entry as the admin user
         adminConnection.add( testEntry );
 
-        DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userName = new Dn( "uid=" + uid + ",ou=users,ou=system" );
 
         LdapConnection userConnection = getConnectionAs( userName, password );
 
         boolean isMoved = false;
-        ModifyDnResponse moveResp = userConnection.move( entryDN.getName(), newParentRdn + ",ou=system" );
+        ModifyDnResponse moveResp = userConnection.move( entryDn.getName(), newParentRdn + ",ou=system" );
 
         if ( moveResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -151,7 +151,7 @@ public class MoveRenameAuthorizationIT e
         }
         else
         {
-            adminConnection.delete( entryDN );
+            adminConnection.delete(entryDn);
             return false;
         }
 
@@ -169,8 +169,8 @@ public class MoveRenameAuthorizationIT e
         {
             if ( isMoved )
             {
-                entryDN = entryDN.add( 1, newParentRdn );
-                adminConnection.delete( entryDN );
+                entryDn = entryDn.add( 1, newParentRdn );
+                adminConnection.delete(entryDn);
             }
 
             result = false;
@@ -191,7 +191,7 @@ public class MoveRenameAuthorizationIT e
     public void testGrantByAdministrators() throws Exception
     {
         // ----------------------------------------------------------------------------
-        // Test simple RDN change: NO SUBTREE MOVEMENT!
+        // Test simple Rdn change: NO SUBTREE MOVEMENT!
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -223,7 +223,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move and RDN change at the same time.
+        // Test move and Rdn change at the same time.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -257,7 +257,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move ONLY without any RDN changes.
+        // Test move ONLY without any Rdn changes.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -301,7 +301,7 @@ public class MoveRenameAuthorizationIT e
     public void testGrantByName() throws Exception
     {
         // ----------------------------------------------------------------------------
-        // Test simple RDN change: NO SUBTREE MOVEMENT!
+        // Test simple Rdn change: NO SUBTREE MOVEMENT!
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -325,7 +325,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move and RDN change at the same time.
+        // Test move and Rdn change at the same time.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -350,7 +350,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move ONLY without any RDN changes.
+        // Test move ONLY without any Rdn changes.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -386,7 +386,7 @@ public class MoveRenameAuthorizationIT e
     public void testGrantBySubtree() throws Exception
     {
         // ----------------------------------------------------------------------------
-        // Test simple RDN change: NO SUBTREE MOVEMENT!
+        // Test simple Rdn change: NO SUBTREE MOVEMENT!
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -410,7 +410,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move and RDN change at the same time.
+        // Test move and Rdn change at the same time.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -435,7 +435,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move ONLY without any RDN changes.
+        // Test move ONLY without any Rdn changes.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -471,7 +471,7 @@ public class MoveRenameAuthorizationIT e
     public void testGrantByAnyuser() throws Exception
     {
         // ----------------------------------------------------------------------------
-        // Test simple RDN change: NO SUBTREE MOVEMENT!
+        // Test simple Rdn change: NO SUBTREE MOVEMENT!
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -495,7 +495,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move and RDN change at the same time.
+        // Test move and Rdn change at the same time.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -520,7 +520,7 @@ public class MoveRenameAuthorizationIT e
         deleteUser( "billyd" );
 
         // ----------------------------------------------------------------------------
-        // Test move ONLY without any RDN changes.
+        // Test move ONLY without any Rdn changes.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user
@@ -556,7 +556,7 @@ public class MoveRenameAuthorizationIT e
     public void testExportAndImportSeperately() throws Exception
     {
         // ----------------------------------------------------------------------------
-        // Test move and RDN change at the same time.
+        // Test move and Rdn change at the same time.
         // ----------------------------------------------------------------------------
 
         // create the non-admin user

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Sun Jan 23 01:17:06 2011
@@ -50,7 +50,7 @@ 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.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -128,14 +128,14 @@ public class SearchAuthorizationIT exten
     }
 
 
-    private void recursivelyAddSearchData( DN parent, Entry[] children, final long sizeLimit, long[] count )
+    private void recursivelyAddSearchData( Dn parent, Entry[] children, final long sizeLimit, long[] count )
         throws Exception
     {
-        DN[] childRdns = new DN[children.length];
+        Dn[] childRdns = new Dn[children.length];
 
         for ( int i = 0; ( i < children.length ) && ( count[0] < sizeLimit ); i++ )
         {
-            DN childRdn = new DN();
+            Dn childRdn = new Dn();
             childRdn = childRdn.addAll( parent );
             childRdn = childRdn.add( "ou=" + i );
             childRdns[i] = childRdn;
@@ -168,9 +168,9 @@ public class SearchAuthorizationIT exten
      * @return the immediate child node created under parent which contains the subtree
      * @throws Exception on error
      */
-    private DN addSearchData( DN parent, int branchingFactor, long sizelimit ) throws Exception
+    private Dn addSearchData( Dn parent, int branchingFactor, long sizelimit ) throws Exception
     {
-        DN base = new DN( "ou=tests," + parent.getName() );
+        Dn base = new Dn( "ou=tests," + parent.getName() );
         Entry entry = getTestNodes( 1 )[0];
         entry.add( SchemaConstants.OU_AT, "tests" );
         entry.setDn( base );
@@ -189,7 +189,7 @@ public class SearchAuthorizationIT exten
      * @param rdn the relative dn from ou=system of the entry to delete recursively
      * @throws Exception if there are problems deleting entries
      */
-    private void recursivelyDelete( DN rdn ) throws Exception
+    private void recursivelyDelete( Dn rdn ) throws Exception
     {
         Cursor<Response> results = reusableAdminCon.search( rdn.getName(), "(objectClass=*)",
             SearchScope.ONELEVEL, "*" );
@@ -197,7 +197,7 @@ public class SearchAuthorizationIT exten
         while ( results.next() )
         {
             SearchResultEntry result = ( SearchResultEntry ) results.get();
-            DN childRdn = result.getEntry().getDn();
+            Dn childRdn = result.getEntry().getDn();
             recursivelyDelete( childRdn );
         }
 
@@ -210,7 +210,7 @@ public class SearchAuthorizationIT exten
      * Performs a single level search as a specific user on newly created data and checks
      * that result set count is 3.  The basic (objectClass=*) filter is used.
      *
-     * @param uid the uid RDN attribute value for the user under ou=users,ou=system
+     * @param uid the uid Rdn attribute value for the user under ou=users,ou=system
      * @param password the password of the user
      * @return true if the search succeeds as expected, false otherwise
      * @throws Exception if there are problems conducting the search
@@ -226,7 +226,7 @@ public class SearchAuthorizationIT exten
      * that result set count is equal to a user specified amount.  The basic
      * (objectClass=*) filter is used.
      *
-     * @param uid the uid RDN attribute value for the user under ou=users,ou=system
+     * @param uid the uid Rdn attribute value for the user under ou=users,ou=system
      * @param password the password of the user
      * @param resultSetSz the expected size of the results
      * @return true if the search succeeds as expected, false otherwise
@@ -243,7 +243,7 @@ public class SearchAuthorizationIT exten
      * that result set count is equal to a user specified amount.  The basic
      * (objectClass=*) filter is used.
      *
-     * @param uid the uid RDN attribute value for the user under ou=users,ou=system
+     * @param uid the uid Rdn attribute value for the user under ou=users,ou=system
      * @param password the password of the user
      * @param scope search controls
      * @param resultSetSz the expected size of the results
@@ -261,7 +261,7 @@ public class SearchAuthorizationIT exten
      * Performs a search as a specific user on newly created data and checks
      * that result set count is equal to a user specified amount.
      *
-     * @param uid the uid RDN attribute value for the user under ou=users,ou=system
+     * @param uid the uid Rdn attribute value for the user under ou=users,ou=system
      * @param password the password of the user
      * @param filter the search filter to use
      * @param scope search scope
@@ -273,8 +273,8 @@ public class SearchAuthorizationIT exten
         throws Exception
     {
 
-        DN base = addSearchData( new DN( "ou=system" ), 3, 10 );
-        DN userDn = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn base = addSearchData( new Dn( "ou=system" ), 3, 10 );
+        Dn userDn = new Dn( "uid=" + uid + ",ou=users,ou=system" );
         results.clear();
         LdapConnection userCtx = getConnectionAs( userDn, password );
         Cursor<Response> cursor = userCtx.search( base.getName(), filter, scope, "*" );
@@ -299,7 +299,7 @@ public class SearchAuthorizationIT exten
      * Adds an entryACI to specified entry below ou=system and runs a search.  Then it
      * checks to see the result size is correct.
      *
-     * @param uid the uid RDN attribute value for the user under ou=users,ou=system
+     * @param uid the uid Rdn attribute value for the user under ou=users,ou=system
      * @param password the password of the user
      * @param scope the search controls
      * @param dn the rdn
@@ -308,12 +308,12 @@ public class SearchAuthorizationIT exten
      * @return true if the search succeeds as expected, false otherwise
      * @throws Exception if there are problems conducting the search
      */
-    private boolean checkSearchAsWithEntryACI( String uid, String password, SearchScope scope, DN dn, String aci,
+    private boolean checkSearchAsWithEntryACI( String uid, String password, SearchScope scope, Dn dn, String aci,
         int resultSetSz ) throws Exception
     {
-        DN base = addSearchData( dn, 3, 10 );
+        Dn base = addSearchData( dn, 3, 10 );
         addEntryACI( base, aci );
-        DN userDn = new DN( "uid=" + uid + ",ou=users,ou=system" );
+        Dn userDn = new Dn( "uid=" + uid + ",ou=users,ou=system" );
 
         results.clear();
         LdapConnection userCtx = getConnectionAs( userDn, password );
@@ -344,7 +344,7 @@ public class SearchAuthorizationIT exten
     public void testAddSearchData() throws Exception
     {
         LdapConnection connection = getAdminConnection();
-        DN base = addSearchData( new DN( "ou=system" ), 3, 10 );
+        Dn base = addSearchData( new Dn( "ou=system" ), 3, 10 );
 
         Cursor<Response> results = connection.search( base.getName(), "(objectClass=*)", SearchScope.SUBTREE,
             "+" );
@@ -460,7 +460,7 @@ public class SearchAuthorizationIT exten
 
     /**
      * Checks to make sure name based userClass works for search operations
-     * when we vary the case of the DN.
+     * when we vary the case of the Dn.
      *
      * @throws Exception if the test encounters an error
      */
@@ -792,7 +792,7 @@ public class SearchAuthorizationIT exten
             + "        grantsAndDenials { denyRead, denyReturnDN, denyBrowse } " + "      } " + "    } " + "  } " + "}";
 
         // try a search operation which should fail without any prescriptive ACI
-        DN testsDn = new DN( "ou=system" );
+        Dn testsDn = new Dn( "ou=system" );
 
         assertFalse( checkSearchAsWithEntryACI( "billyd", "billyd", SearchScope.SUBTREE, testsDn, aci, 9 ) );
 
@@ -837,7 +837,7 @@ public class SearchAuthorizationIT exten
             + "        grantsAndDenials { denyRead, denyReturnDN, denyBrowse } " + "      } " + "    } " + "  } " + "}";
 
         // try a search operation which should fail without any prescriptive ACI
-        DN testsDn = new DN( "ou=system" );
+        Dn testsDn = new Dn( "ou=system" );
 
         assertFalse( checkSearchAsWithEntryACI( "billyd", "billyd", SearchScope.SUBTREE, testsDn, aci, 9 ) );
 
@@ -877,15 +877,15 @@ public class SearchAuthorizationIT exten
     /**
      * Performs an object level search on the specified subentry relative to ou=system as a specific user.
      *
-     * @param uid the uid RDN attribute value of the user to perform the search as
+     * @param uid the uid Rdn attribute value of the user to perform the search as
      * @param password the password of the user
      * @param dn the relative name to the subentry under the ou=system AP
      * @return the single search result if access is allowed or null
      * @throws Exception if the search fails w/ exception other than no permission
      */
-    private SearchResultEntry checkCanSearhSubentryAs( String uid, String password, DN dn ) throws Exception
+    private SearchResultEntry checkCanSearhSubentryAs( String uid, String password, Dn dn ) throws Exception
     {
-        LdapConnection userCtx = getConnectionAs( new DN( "uid=" + uid + ",ou=users,ou=system" ), password );
+        LdapConnection userCtx = getConnectionAs( new Dn( "uid=" + uid + ",ou=users,ou=system" ), password );
         SearchResultEntry result = null;
         Cursor<Response> list = null;
 
@@ -916,7 +916,7 @@ public class SearchAuthorizationIT exten
             + "}" );
 
         // check and see if we can access the subentry now
-        assertNotNull( checkCanSearhSubentryAs( "billyd", "billyd", new DN( "cn=anybodySearch,ou=system" ) ) );
+        assertNotNull( checkCanSearhSubentryAs( "billyd", "billyd", new Dn( "cn=anybodySearch,ou=system" ) ) );
 
         // now add a denial to prevent all users except the admin from accessing the subentry
         addSubentryACI( "{ " + "  identificationTag \"searchAci\", " + "  precedence 14, "
@@ -926,7 +926,7 @@ public class SearchAuthorizationIT exten
             + "        grantsAndDenials { denyRead, denyReturnDN, denyBrowse } " + "      } " + "    } " + "  } " + "}" );
 
         // now we should not be able to access the subentry with a search
-        assertNull( checkCanSearhSubentryAs( "billyd", "billyd", new DN( "cn=anybodySearch,ou=system" ) ) );
+        assertNull( checkCanSearhSubentryAs( "billyd", "billyd", new Dn( "cn=anybodySearch,ou=system" ) ) );
     }
 
 
@@ -975,7 +975,7 @@ public class SearchAuthorizationIT exten
         createUser( "billyd", "billyd" );
 
         // create an entry subordinate to the user
-        Entry phoneBook = new DefaultEntry( new DN( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) );
+        Entry phoneBook = new DefaultEntry( new Dn( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) );
         phoneBook.add( SchemaConstants.OU_AT, "phoneBook" );
         phoneBook.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
 
@@ -990,7 +990,7 @@ public class SearchAuthorizationIT exten
             + "}" );
 
         // check and see if we can access the subentry now
-        assertNotNull( checkCanSearhSubentryAs( "billyd", "billyd", new DN(
+        assertNotNull( checkCanSearhSubentryAs( "billyd", "billyd", new Dn(
             "ou=phoneBook,uid=billyd,ou=users,ou=system" ) ) );
 
         // now add a denial to prevent all users except the admin from accessing the subentry
@@ -1002,7 +1002,7 @@ public class SearchAuthorizationIT exten
             + "        grantsAndDenials { denyRead, denyReturnDN, denyBrowse } " + "      } " + "    } " + "  } " + "}" );
 
         // now we should not be able to access the subentry with a search
-        assertNull( checkCanSearhSubentryAs( "billyd", "billyd", new DN( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) ) );
+        assertNull( checkCanSearhSubentryAs( "billyd", "billyd", new Dn( "ou=phoneBook,uid=billyd,ou=users,ou=system" ) ) );
     }
 
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Sun Jan 23 01:17:06 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.ModifyRequest;
 import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -76,7 +76,7 @@ public class DefaultChangeLogIT extends 
         long revision = service.getChangeLog().getCurrentRevision();
 
         // add new test entry
-        Entry entry = new DefaultEntry( new DN( "ou=test0,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test0,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.add( SchemaConstants.OU_AT, "test0" );
         sysRoot.add( entry );
@@ -89,7 +89,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( revision + 1, t0.getRevision() );
 
         // add another test entry
-        entry = new DefaultEntry( new DN( "ou=test1,ou=system" ) );
+        entry = new DefaultEntry( new Dn( "ou=test1,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test1" );
         sysRoot.add( entry );
@@ -109,7 +109,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( revision + 2, t1.getRevision() );
 
         // add third test entry
-        entry = new DefaultEntry( new DN( "ou=test2,ou=system" ) );
+        entry = new DefaultEntry( new Dn( "ou=test2,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test2" );
         sysRoot.add( entry );
@@ -160,7 +160,7 @@ public class DefaultChangeLogIT extends 
         assertEquals( revision, service.getChangeLog().getCurrentRevision() );
 
         // add new test entry
-        Entry entry = new DefaultEntry( new DN( "ou=test,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
@@ -185,7 +185,7 @@ public class DefaultChangeLogIT extends 
     {
         LdapConnection sysRoot = getAdminConnection( service );
         Tag t0 = service.getChangeLog().tag();
-        Entry entry = new DefaultEntry( new DN( "ou=test,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
@@ -204,7 +204,7 @@ public class DefaultChangeLogIT extends 
         Tag t0 = service.getChangeLog().tag();
 
         // add new test entry
-        Entry entry = new DefaultEntry( new DN( "ou=test,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
@@ -226,7 +226,7 @@ public class DefaultChangeLogIT extends 
     public void testRevertDeleteOperations() throws Exception
     {
         LdapConnection sysRoot = getAdminConnection( service );
-        Entry entry = new DefaultEntry( new DN( "ou=test,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test" );
         sysRoot.add( entry );
@@ -249,7 +249,7 @@ public class DefaultChangeLogIT extends 
     public void testRevertRenameOperations() throws Exception
     {
         LdapConnection sysRoot = getAdminConnection( service );
-        Entry entry = new DefaultEntry( new DN( "ou=oldname,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=oldname,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "oldname" );
         sysRoot.add( entry );
@@ -275,7 +275,7 @@ public class DefaultChangeLogIT extends 
     public void testRevertModifyOperations() throws Exception
     {
         LdapConnection sysRoot = getAdminConnection( service );
-        Entry entry = new DefaultEntry( new DN( "ou=test5,ou=system" ) );
+        Entry entry = new DefaultEntry( new Dn( "ou=test5,ou=system" ) );
         entry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
         entry.put( SchemaConstants.OU_AT, "test5" );
         sysRoot.add( entry );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Sun Jan 23 01:17:06 2011
@@ -49,7 +49,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -71,7 +71,7 @@ public class CollectiveAttributeServiceI
 
     private Entry getTestEntry( String dn, String cn ) throws LdapLdifException, LdapException
     {
-        Entry subentry = LdifUtils.createEntry( new DN( dn ), "objectClass: top", "objectClass: person", "cn", cn,
+        Entry subentry = LdifUtils.createEntry( new Dn( dn ), "objectClass: top", "objectClass: person", "cn", cn,
             "sn: testentry" );
 
         return subentry;
@@ -80,7 +80,7 @@ public class CollectiveAttributeServiceI
 
     private Entry getTestSubentry( String dn ) throws LdapLdifException, LdapException
     {
-        Entry subentry = LdifUtils.createEntry( new DN( dn ), "objectClass: top", "objectClass: subentry",
+        Entry subentry = LdifUtils.createEntry( new Dn( dn ), "objectClass: top", "objectClass: subentry",
             "objectClass: collectiveAttributeSubentry", "c-ou: configuration",
             "subtreeSpecification: { base \"ou=configuration\" }", "cn: testsubentry" );
 
@@ -90,7 +90,7 @@ public class CollectiveAttributeServiceI
 
     private Entry getTestSubentry2( String dn ) throws LdapLdifException, LdapException
     {
-        Entry subentry = LdifUtils.createEntry( new DN( dn ), "objectClass: top", "objectClass: subentry",
+        Entry subentry = LdifUtils.createEntry( new Dn( dn ), "objectClass: top", "objectClass: subentry",
             "objectClass: collectiveAttributeSubentry", "c-ou: configuration2",
             "subtreeSpecification: { base \"ou=configuration\" }", "cn: testsubentry2" );
 
@@ -100,7 +100,7 @@ public class CollectiveAttributeServiceI
 
     private Entry getTestSubentry3( String dn ) throws LdapLdifException, LdapException
     {
-        Entry subentry = LdifUtils.createEntry( new DN( dn ), "objectClass: top", "objectClass: subentry",
+        Entry subentry = LdifUtils.createEntry( new Dn( dn ), "objectClass: top", "objectClass: subentry",
             "objectClass: collectiveAttributeSubentry", "c-st: FL",
             "subtreeSpecification: { base \"ou=configuration\" }", "cn: testsubentry3" );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -62,7 +62,7 @@ public class PartitionConfigurationIT ex
         // Test AddContextPartition
         service.addPartition( partition );
 
-        DN suffixDn = new DN( "ou=removable", service.getSchemaManager() );
+        Dn suffixDn = new Dn( "ou=removable", service.getSchemaManager() );
 
         Entry ctxEntry = LdifUtils.createEntry( service.getSchemaManager(), suffixDn,
             "objectClass: top",



Mime
View raw message