You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/23 02:17:26 UTC
svn commit: r1062306 [6/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...
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Sun Jan 23 01:17:06 2011
@@ -47,8 +47,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.Response;
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.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -66,13 +66,13 @@ public class ExceptionServiceIT extends
private AddResponse createSubContext( String type, String value ) throws Exception
{
- return createSubContext( new DN( ServerDNConstants.SYSTEM_DN ), type, value );
+ return createSubContext( new Dn( ServerDNConstants.SYSTEM_DN ), type, value );
}
- private AddResponse createSubContext( DN parent, String type, String value ) throws Exception
+ private AddResponse createSubContext( Dn parent, String type, String value ) throws Exception
{
- DN dn = parent;
+ Dn dn = parent;
dn = dn.add( "ou=" + value );
Entry entry = new DefaultEntry( dn );
entry.add( SchemaConstants.OBJECT_CLASS_AT, "person" );
@@ -141,15 +141,15 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- Entry entry = new DefaultEntry( new DN( "ou=users,ou=groups,ou=system" ) );
+ Entry entry = new DefaultEntry( new Dn( "ou=users,ou=groups,ou=system" ) );
entry.add( SchemaConstants.OBJECT_CLASS_AT, "OrganizationalUnit" );
entry.add( SchemaConstants.OU_AT, "users" );
connection.add( entry );
- ModifyDnResponse resp = connection.rename( entry.getDn(), new RDN( "ou=users" ) );
+ ModifyDnResponse resp = connection.rename( entry.getDn(), new Rdn( "ou=users" ) );
assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, resp.getLdapResult().getResultCode() );
- Entry userzEntry = new DefaultEntry( new DN( "ou=userz,ou=groups,ou=system" ) );
+ Entry userzEntry = new DefaultEntry( new Dn( "ou=userz,ou=groups,ou=system" ) );
userzEntry.add( SchemaConstants.OBJECT_CLASS_AT, "OrganizationalUnit" );
userzEntry.add( SchemaConstants.OU_AT, "userz" );
@@ -265,7 +265,7 @@ public class ExceptionServiceIT extends
LdapConnection connection = getAdminConnection( service );
ModifyRequest modReq = new ModifyRequestImpl();
- modReq.setName( new DN( "ou=blah,ou=system" ) );
+ modReq.setName( new Dn( "ou=blah,ou=system" ) );
modReq.add( SchemaConstants.OU_AT, "another-value" );
ModifyResponse modResp = connection.modify( modReq );
@@ -285,7 +285,7 @@ public class ExceptionServiceIT extends
LdapConnection connection = getAdminConnection( service );
ModifyRequest modReq = new ModifyRequestImpl();
- modReq.setName( new DN( "ou=users,ou=system" ) );
+ modReq.setName( new Dn( "ou=users,ou=system" ) );
modReq.add( SchemaConstants.OU_AT, "dummyValue" );
connection.modify( modReq );
@@ -396,13 +396,13 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- Entry entry = new DefaultEntry( new DN( "cn=toanother,ou=system" ) );
+ Entry entry = new DefaultEntry( new Dn( "cn=toanother,ou=system" ) );
entry.add( SchemaConstants.OBJECT_CLASS_AT, "alias", SchemaConstants.EXTENSIBLE_OBJECT_OC );
entry.add( "aliasedObjectName", "ou=users,ou=system" );
connection.add( entry );
- Entry aliasChild = new DefaultEntry( new DN( "ou=blah,cn=toanother,ou=system" ) );
+ Entry aliasChild = new DefaultEntry( new Dn( "ou=blah,cn=toanother,ou=system" ) );
aliasChild.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
aliasChild.add( SchemaConstants.OU_AT, "blah" );
@@ -437,7 +437,7 @@ public class ExceptionServiceIT extends
LdapConnection connection = getAdminConnection( service );
AddResponse resp = createSubContext( "ou", "blah" );
- resp = createSubContext( new DN( "ou=blah,ou=system" ), "ou", "subctx" );
+ resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
Entry entry = connection.lookup( "ou=subctx,ou=blah,ou=system" );
assertNotNull( entry );
}
@@ -458,7 +458,7 @@ public class ExceptionServiceIT extends
LdapConnection connection = getAdminConnection( service );
AddResponse resp = createSubContext( "ou", "blah" );
- resp = createSubContext( new DN( "ou=blah,ou=system" ), "ou", "subctx" );
+ resp = createSubContext( new Dn( "ou=blah,ou=system" ), "ou", "subctx" );
DeleteResponse delResp = connection.delete( "ou=blah,ou=system" );
assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, delResp.getLdapResult().getResultCode() );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Sun Jan 23 01:17:06 2011
@@ -70,7 +70,7 @@ public class CreateContextIT extends Abs
/**
- * DIRSERVER-628: Creation of entry with multivalued RDN leads to wrong
+ * DIRSERVER-628: Creation of entry with multivalued Rdn leads to wrong
* attribute value.
*
* @throws NamingException on error
@@ -439,7 +439,7 @@ public class CreateContextIT extends Abs
try
{
sysRoot.createSubcontext( "ou=subtest" );
- fail( "It is not allowed to create a context with a bad RDN. CN is mandatory");
+ fail( "It is not allowed to create a context with a bad Rdn. CN is mandatory");
}
catch ( NamingException ne )
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java Sun Jan 23 01:17:06 2011
@@ -98,11 +98,11 @@ public class DIRSERVER791IT extends Abst
/**
* Tests that it is possible to remove a value (in this case "cn=aaa")
- * from the RDN attribute which is not part of the RDN
+ * from the Rdn attribute which is not part of the Rdn
*
* The defect was:
- * Removal of a value from RDN attribute which is not part
- * of the RDN is not possible.
+ * Removal of a value from Rdn attribute which is not part
+ * of the Rdn is not possible.
*
* @throws NamingException on error
*/
@@ -116,7 +116,7 @@ public class DIRSERVER791IT extends Abst
env.put( Context.PROVIDER_URL, "ou=system" );
DirContext ctx = new InitialDirContext( env );
- // remove "cn=aaa", which is not part of the RDN
+ // remove "cn=aaa", which is not part of the Rdn
Attribute attr = new BasicAttribute( "cn", "aaa" );
ModificationItem modification = new ModificationItem( DirContext.REMOVE_ATTRIBUTE, attr );
ctx.modifyAttributes( "cn=test", new ModificationItem[]
@@ -134,7 +134,7 @@ public class DIRSERVER791IT extends Abst
/**
- * Tests that it is possible to replace the RDN attribute with
+ * Tests that it is possible to replace the Rdn attribute with
*
* Checks whether it is possible to replace the cn attribute with a single
* value. The JIRA issue states that this one works.
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Sun Jan 23 01:17:06 2011
@@ -58,7 +58,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
-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;
@@ -272,7 +272,7 @@ public class ReferralIT extends Abstract
catch ( PartialResultException pre )
{
assertEquals( "cn=alex karasulu,ou=apache", pre.getRemainingName().toString() );
- assertEquals( DN.EMPTY_DN, new DN( pre.getResolvedName().toString() ) );
+ assertEquals( Dn.EMPTY_DN, new Dn( pre.getResolvedName().toString() ) );
}
}
@@ -328,8 +328,8 @@ public class ReferralIT extends Abstract
// Attempt to add a normal entry below the referral ancestor. We should
// encounter referral errors with referral setting set to throw.
// -------------------------------------------------------------------
- DN userDN = new DN( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
- Entry userEntry = new DefaultEntry( service.getSchemaManager(), userDN );
+ Dn userDn = new Dn( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
+ Entry userEntry = new DefaultEntry( service.getSchemaManager(), userDn);
userEntry.add( "ObjectClass", "top", "person" );
userEntry.add( "sn", "karasulu" );
@@ -343,7 +343,7 @@ public class ReferralIT extends Abstract
catch ( LdapPartialResultException lpre )
{
assertEquals( "cn=alex karasulu,ou=apache", lpre.getRemainingDn().toString() );
- assertEquals( DN.EMPTY_DN, lpre.getResolvedDn() );
+ assertEquals( Dn.EMPTY_DN, lpre.getResolvedDn() );
}
}
@@ -430,7 +430,7 @@ public class ReferralIT extends Abstract
{
if ( td.refCtx instanceof ServerLdapContext )
{
- DN dn = new DN( "cn=alex karasulu,ou=users,ou=system" );
+ Dn dn = new Dn( "cn=alex karasulu,ou=users,ou=system" );
( ( ServerLdapContext ) td.refCtx ).compare( dn, "sn", "karasulu" );
}
else
@@ -470,7 +470,7 @@ public class ReferralIT extends Abstract
{
if ( td.refCtx instanceof ServerLdapContext )
{
- DN dn = new DN( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
+ Dn dn = new Dn( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
( ( ServerLdapContext ) td.refCtx ).compare( dn, "sn", "karasulu" );
}
else
@@ -1160,7 +1160,7 @@ public class ReferralIT extends Abstract
/**
- * Checks that when injecting LDAP ref with an empty DN we get an exception
+ * Checks that when injecting LDAP ref with an empty Dn we get an exception
*
* @throws Exception on error
*/
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Sun Jan 23 01:17:06 2011
@@ -51,7 +51,7 @@ import org.junit.runner.RunWith;
/**
- * Test DIRSERVER-757 : a UniqueMember attribute should only contain a DN completed with an
+ * Test DIRSERVER-757 : a UniqueMember attribute should only contain a Dn completed with an
* optional UID.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Sun Jan 23 01:17:06 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -125,7 +125,7 @@ public class AddReferralIT extends Abstr
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Sun Jan 23 01:17:06 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -130,7 +130,7 @@ public class CompareReferralIT extends A
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -234,7 +234,7 @@ public class CompareReferralIT extends A
try
{
- session.compare( new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", false );
+ session.compare( new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", false );
fail();
}
catch ( LdapReferralException re )
@@ -268,7 +268,7 @@ public class CompareReferralIT extends A
try
{
- session.compare( new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", true );
+ session.compare( new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", true );
fail();
}
catch ( LdapPartialResultException lpre )
@@ -388,7 +388,7 @@ public class CompareReferralIT extends A
try
{
- session.compare( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", false );
+ session.compare( new Dn( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", false );
fail();
}
catch ( LdapReferralException re )
@@ -420,6 +420,6 @@ public class CompareReferralIT extends A
{
CoreSession session = service.getAdminSession();
- assertTrue( session.compare( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", true ) );
+ assertTrue( session.compare( new Dn( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", true ) );
}
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Sun Jan 23 01:17:06 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -121,7 +121,7 @@ public class DeleteReferralIT extends Ab
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -190,7 +190,7 @@ public class DeleteReferralIT extends Ab
try
{
- session.delete( new DN( "cn=Emmanuel Lecharny,ou=Roles" ) );
+ session.delete( new Dn( "cn=Emmanuel Lecharny,ou=Roles" ) );
fail();
}
catch ( LdapNoSuchObjectException lnsoe )
@@ -207,7 +207,7 @@ public class DeleteReferralIT extends Ab
public void testDeleteExistingEntryNotReferral() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dn = new DN( "cn=Alex Karasulu,o=MNN,c=WW,ou=system" );
+ Dn dn = new Dn( "cn=Alex Karasulu,o=MNN,c=WW,ou=system" );
session.delete( dn );
@@ -272,7 +272,7 @@ public class DeleteReferralIT extends Ab
MNNCtx.destroySubcontext( "ou=Roles" );
- DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
// We should not find the entry
try
@@ -295,7 +295,7 @@ public class DeleteReferralIT extends Ab
public void testDeleteExistingEntryReferralCoreAPINoManageDSAIt() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
try
{
@@ -330,7 +330,7 @@ public class DeleteReferralIT extends Ab
public void testDeleteExistingEntryReferralCoreAPIManageDSAIT() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
session.delete( dn, true );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Sun Jan 23 01:17:06 2011
@@ -56,7 +56,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -133,7 +133,7 @@ public class ModifyReferralIT extends Ab
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -248,7 +248,7 @@ public class ModifyReferralIT extends Ab
mods.add( mod );
- session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods );
+ session.modify( new Dn( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods );
fail();
}
catch ( LdapNoSuchObjectException lnsoe )
@@ -276,7 +276,7 @@ public class ModifyReferralIT extends Ab
mods.add( mod );
- session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods, true );
+ session.modify( new Dn( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods, true );
fail();
}
catch ( LdapNoSuchObjectException lnsoe )
@@ -384,7 +384,7 @@ public class ModifyReferralIT extends Ab
mods.add( mod );
- session.modify( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, false );
+ session.modify( new Dn( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, false );
fail();
}
catch ( LdapReferralException re )
@@ -423,7 +423,7 @@ public class ModifyReferralIT extends Ab
mods.add( mod );
- session.modify( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, true );
+ session.modify( new Dn( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, true );
// Now try to retrieve this attribute
Attributes result = MNNCtx.getAttributes( "ou=Roles", new String[]{ "description" } );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Sun Jan 23 01:17:06 2011
@@ -48,8 +48,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -150,7 +150,7 @@ public class MoveAndRenameReferralIT ext
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -238,9 +238,9 @@ public class MoveAndRenameReferralIT ext
public void testMoveAndRenameEntrySuperiorHasReferralAncestorCoreAPIWithoutManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "o=PNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex" );
try
{
@@ -275,9 +275,9 @@ public class MoveAndRenameReferralIT ext
public void testMoveAndRenameSuperiorHasReferralAncestorCoreAPIWithManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "o=PNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex" );
try
{
@@ -426,9 +426,9 @@ public class MoveAndRenameReferralIT ext
public void testMoveAndRenameIsReferralCoreAPIWithoutManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "o=PNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex" );
try
{
@@ -463,9 +463,9 @@ public class MoveAndRenameReferralIT ext
public void testMoveAndRenameIsReferralCoreAPIWithManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "o=PNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "o=PNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Sun Jan 23 01:17:06 2011
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -141,7 +141,7 @@ public class MoveReferralIT extends Abst
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -230,8 +230,8 @@ public class MoveReferralIT extends Abst
public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
try
{
@@ -266,8 +266,8 @@ public class MoveReferralIT extends Abst
public void testMoveNotExistingSuperiorReferralAncestorCoreAPIWithManageDsaIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
- DN newParent = new DN( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn newParent = new Dn( "cn=Emmanuel Lecharny,o=PNN,c=WW,ou=system" );
try
{
@@ -458,8 +458,8 @@ public class MoveReferralIT extends Abst
public void testMoveEntryWithReferralAncestorCoreAPIWithoutManageDsaIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN orig = new DN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
- DN dest = new DN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
+ Dn orig = new Dn( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
+ Dn dest = new Dn( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
try
{
@@ -494,8 +494,8 @@ public class MoveReferralIT extends Abst
public void testMoveEntryWithReferralAncestorCoreAPIWithManageDsaIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN orig = new DN( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
- DN dest = new DN( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
+ Dn orig = new Dn( "cn=Alex,ou=roles,o=MNN,c=WW,ou=system" );
+ Dn dest = new Dn( "cn=Alex,ou=People,o=MNN,c=WW,ou=system" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Sun Jan 23 01:17:06 2011
@@ -45,8 +45,8 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,7 +56,7 @@ import org.junit.runner.RunWith;
* Tests the referral handling functionality for the Modify operation
* within the server's core.
*
- * The Move operation is a ModifyDN where the RDN is changed, not the superior.
+ * The Move operation is a ModifyDN where the Rdn is changed, not the superior.
*
* All the tests are described on this page :
* http://cwiki.apache.org/confluence/display/DIRxSRVx11/Referral+Handling+Changes
@@ -138,7 +138,7 @@ public class RenameReferralIT extends Ab
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -210,8 +210,8 @@ public class RenameReferralIT extends Ab
try
{
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex Karasulu" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, false );
fail();
}
@@ -320,8 +320,8 @@ public class RenameReferralIT extends Ab
try
{
- DN dn = new DN( "ou=roles,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex Karasulu" );
+ Dn dn = new Dn( "ou=roles,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, false );
fail();
}
@@ -346,7 +346,7 @@ public class RenameReferralIT extends Ab
/**
- * Test a rename an entry using an already existing RDN (the new entry already exists), not a referral
+ * Test a rename an entry using an already existing Rdn (the new entry already exists), not a referral
*/
@Test
public void testRenameRdnExistNotReferral() throws Exception
@@ -364,7 +364,7 @@ public class RenameReferralIT extends Ab
/**
- * Test a rename a referral using an already existing RDN (the new entry already exists and is a referral),
+ * Test a rename a referral using an already existing Rdn (the new entry already exists and is a referral),
* using JNDI throw
*/
@Test
@@ -397,15 +397,15 @@ public class RenameReferralIT extends Ab
/**
- * Test a rename a referral using an already existing RDN (the new entry already exists and is a referral),
+ * Test a rename a referral using an already existing Rdn (the new entry already exists and is a referral),
* using the Core API, without the ManageDsaIt flag
*/
@Test
public void testRenameRdnExistIsReferralCoreAPIWithoutManageDsaIt() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "ou=People" );
+ Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "ou=People" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIgnoreIT.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.LdapEntryAlreadyExistsException;
import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
-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.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,7 +54,7 @@ import org.junit.runner.RunWith;
* Tests the referral handling functionality for the Modify operation
* within the server's core.
*
- * The Move operation is a ModifyDN where the RDN is changed, not the superior.
+ * The Move operation is a ModifyDN where the Rdn is changed, not the superior.
*
* All the tests are described on this page :
* http://cwiki.apache.org/confluence/display/DIRxSRVx11/Referral+Handling+Changes
@@ -136,7 +136,7 @@ public class RenameReferralIgnoreIT exte
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -175,8 +175,8 @@ public class RenameReferralIgnoreIT exte
CoreSession session = service.getAdminSession();
try
{
- DN dn = new DN( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "cn=Alex Karasulu" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny,ou=apache,ou=roles,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "cn=Alex Karasulu" );
session.rename( dn, newRdn, false, true );
fail();
}
@@ -238,9 +238,9 @@ public class RenameReferralIgnoreIT exte
public void testRenameExistingReferralCoreAPIWithManageDsaIt() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dnRoles = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
- DN dnGroups = new DN( "ou=Groups,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "ou=Groups" );
+ Dn dnRoles = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Dn dnGroups = new Dn( "ou=Groups,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "ou=Groups" );
// First check that the object exists
Entry renamed = session.lookup( dnRoles );
@@ -278,7 +278,7 @@ public class RenameReferralIgnoreIT exte
/**
- * Test a rename a referral using an already existing RDN (the new entry already exists and is a referral),
+ * Test a rename a referral using an already existing Rdn (the new entry already exists and is a referral),
* using JNDI ignore
*/
@Test
@@ -298,15 +298,15 @@ public class RenameReferralIgnoreIT exte
/**
- * Test a rename a referral using an already existing RDN (the new entry already exists and is a referral),
+ * Test a rename a referral using an already existing Rdn (the new entry already exists and is a referral),
* using the Core API, with the ManageDsaIt flag
*/
@Test
public void testRenameRdnExistIsReferralCoreAPIWithManageDsaIt() throws Exception
{
CoreSession session = service.getAdminSession();
- DN dn = new DN( "ou=Roles,o=MNN,c=WW,ou=system" );
- RDN newRdn = new RDN( "ou=People" );
+ Dn dn = new Dn( "ou=Roles,o=MNN,c=WW,ou=system" );
+ Rdn newRdn = new Rdn( "ou=People" );
try
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Sun Jan 23 01:17:06 2011
@@ -50,7 +50,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-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;
@@ -140,7 +140,7 @@ public class SearchReferralIT extends Ab
userEntry.put( "cn", "Emmanuel Lecharny" );
// Core API entry
- DN dn = new DN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
+ Dn dn = new Dn( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
serverEntry = new DefaultEntry( service.getSchemaManager(), dn );
serverEntry.put( "ObjectClass", "top", "person" );
@@ -235,7 +235,7 @@ public class SearchReferralIT extends Ab
public void testSearchWithReferralAncestorCoreAPIWithoutManageDSAIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
try
{
@@ -270,7 +270,7 @@ public class SearchReferralIT extends Ab
public void testSearchWithReferralAncestorCoreAPIWithManageDSAIt() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=nobody,ou=apache,ou=roles,o=Mnn,c=WW,ou=system" );
try
{
@@ -387,7 +387,7 @@ public class SearchReferralIT extends Ab
public void testSearchExistingReferralCoreAPIWithoutManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "ou=roles,o=Mnn,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=roles,o=Mnn,c=WW,ou=system" );
try
{
@@ -421,7 +421,7 @@ public class SearchReferralIT extends Ab
public void testSearchExistingReferralCoreAPIWithManageDsaIT() throws Exception
{
CoreSession coreSession = service.getAdminSession();
- DN dn = new DN( "ou=roles,o=Mnn,c=WW,ou=system" );
+ Dn dn = new Dn( "ou=roles,o=Mnn,c=WW,ou=system" );
EntryFilteringCursor cursor = coreSession.search( dn, "(ObjectClass=*)", true );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Sun Jan 23 01:17:06 2011
@@ -46,7 +46,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.apache.directory.shared.util.Strings;
import org.junit.After;
import org.junit.Before;
@@ -97,7 +97,7 @@ public class OperationalAttributeService
public void testBinaryAttributeFilterExtension() throws Exception
{
Entry entry = LdifUtils
- .createEntry( new DN( "ou=test,ou=system" ), "objectClass: top", "objectClass: person",
+ .createEntry( new Dn( "ou=test,ou=system" ), "objectClass: top", "objectClass: person",
"objectClass: organizationalPerson", "objectClass: inetOrgPerson", "ou", "test", "cn", "test", "sn",
"test" );
@@ -114,7 +114,7 @@ public class OperationalAttributeService
{ ( byte ) 0xFF, ( byte ) 0xD8, ( byte ) 0xFF, ( byte ) 0xE0, 0x01, 0x02, 'J', 'F', 'I', 'F', 0x00, 0x45,
0x23, 0x7d, 0x7f };
entry.put( "jpegPhoto", keyValue );
- entry.setDn( new DN( "ou=anothertest,ou=system" ) );
+ entry.setDn( new Dn( "ou=anothertest,ou=system" ) );
entry.set( "ou", "anothertest" );
connection.add( entry );
Entry loadedEntry = connection.lookup( "ou=anothertest,ou=system" );
@@ -135,7 +135,7 @@ public class OperationalAttributeService
/*
* create ou=testing00,ou=system
*/
- Entry entry = LdifUtils.createEntry( new DN( "ou=testing00,ou=system" ), "objectClass: top",
+ Entry entry = LdifUtils.createEntry( new Dn( "ou=testing00,ou=system" ), "objectClass: top",
"objectClass: organizationalUnit", "ou", "testing00" );
connection.add( entry );
@@ -203,7 +203,7 @@ public class OperationalAttributeService
/**
* Test which confirms that all new users created under the user's dn
- * (ou=users,ou=system) have the creatorsName set to the DN of the new
+ * (ou=users,ou=system) have the creatorsName set to the Dn of the new
* user even though the admin is creating the user. This is the basis
* for some authorization rules to protect passwords.
*
@@ -217,7 +217,7 @@ public class OperationalAttributeService
@Test
public void testConfirmNonAdminUserDnIsCreatorsName() throws Exception
{
- Entry entry = LdifUtils.createEntry( new DN( "uid=akarasulu,ou=users,ou=system" ), "objectClass: top",
+ Entry entry = LdifUtils.createEntry( new Dn( "uid=akarasulu,ou=users,ou=system" ), "objectClass: top",
"objectClass: person", "objectClass: organizationalPerson", "objectClass: inetOrgPerson",
"ou: Engineering", "ou: People", "uid: akarasulu", "l", "Bogusville", "cn: Alex Karasulu", "sn: Karasulu",
"givenName", "mail: akarasulu@apache.org", "telephoneNumber: +1 408 555 4798",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
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.Test;
import org.junit.runner.RunWith;
@@ -73,7 +73,7 @@ public class AddPerfIT extends AbstractL
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
@@ -102,7 +102,7 @@ public class AddPerfIT extends AbstractL
}
String name = "test" + i;
- dn = new DN( "cn=" + name + ",ou=system" );
+ dn = new Dn( "cn=" + name + ",ou=system" );
entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", name.toUpperCase() );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/PasswordHashingInterceptorTest.java Sun Jan 23 01:17:06 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
-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.junit.Test;
import org.junit.runner.RunWith;
@@ -71,7 +71,7 @@ public class PasswordHashingInterceptorT
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
byte[] plainPwd = "secret".getBytes();
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
Entry entry = connection.lookup( dn );
EntryAttribute pwdAt = entry.get( SchemaConstants.USER_PASSWORD_AT );
@@ -87,7 +87,7 @@ public class PasswordHashingInterceptorT
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
byte[] plainPwd = "newsecret".getBytes();
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
AttributeType pwdAtType = service.getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
@@ -113,7 +113,7 @@ public class PasswordHashingInterceptorT
byte[] plainPwd = "secret".getBytes();
byte[] hashedPwd = PasswordUtil.createStoragePassword( plainPwd, LdapSecurityConstants.HASH_METHOD_SSHA );
- DN dn = new DN( "cn=testHash,ou=system" );
+ Dn dn = new Dn( "cn=testHash,ou=system" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
@@ -137,7 +137,7 @@ public class PasswordHashingInterceptorT
byte[] plainPwd = "xyzsecret".getBytes();
byte[] hashedPwd = PasswordUtil.createStoragePassword( plainPwd, LdapSecurityConstants.HASH_METHOD_SSHA256 );
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
AttributeType pwdAtType = service.getSchemaManager().lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Sun Jan 23 01:17:06 2011
@@ -167,7 +167,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.
*
* @throws Exception on error
*/
@@ -354,7 +354,7 @@ public class SimpleBindIT extends Abstra
}
catch ( OperationNotSupportedException onse )
{
- assertEquals( "Cannot Bind for DN uid=admin,ou=system", onse.getMessage() );
+ assertEquals( "Cannot Bind for Dn uid=admin,ou=system", onse.getMessage() );
}
catch ( NamingException ne )
{
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java Sun Jan 23 01:17:06 2011
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.CompareResponse;
-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;
@@ -73,7 +73,7 @@ public class ComparePerfIT extends Abstr
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=test,dc=example,dc=com" );
+ Dn dn = new Dn( "cn=test,dc=example,dc=com" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
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.Test;
import org.junit.runner.RunWith;
@@ -72,7 +72,7 @@ public class DeletePerfIT extends Abstra
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=test,dc=example,dc=com" );
+ Dn dn = new Dn( "cn=test,dc=example,dc=com" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
@@ -81,7 +81,7 @@ public class DeletePerfIT extends Abstra
connection.add(entry );
// Deletion
- dn = new DN( "cn=test,dc=example,dc=com" );
+ dn = new Dn( "cn=test,dc=example,dc=com" );
connection.delete( dn );
@@ -97,7 +97,7 @@ public class DeletePerfIT extends Abstra
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=test,dc=example,dc=com" );
+ Dn dn = new Dn( "cn=test,dc=example,dc=com" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
@@ -119,7 +119,7 @@ public class DeletePerfIT extends Abstra
}
String name = "test" + i;
- dn = new DN( "cn=" + name + ",dc=example,dc=com" );
+ dn = new Dn( "cn=" + name + ",dc=example,dc=com" );
entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", name.toUpperCase() );
@@ -154,7 +154,7 @@ public class DeletePerfIT extends Abstra
}
String name = "test" + i;
- dn = new DN( "cn=" + name + ",dc=example,dc=com" );
+ dn = new Dn( "cn=" + name + ",dc=example,dc=com" );
connection.delete( dn );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/exists/ExistsIT.java Sun Jan 23 01:17:06 2011
@@ -71,7 +71,7 @@ public class ExistsIT extends AbstractLd
/**
- * Test a exists( DN ) operation
+ * Test a exists( Dn ) operation
*/
@Test
public void testExists() throws Exception
@@ -81,7 +81,7 @@ public class ExistsIT extends AbstractLd
/**
- * Test a wrong exists( DN ) operation
+ * Test a wrong exists( Dn ) operation
*/
@Test
public void testNotExists() throws Exception
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/hasEntry/hasEntryPerfIT.java Sun Jan 23 01:17:06 2011
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTru
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
-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;
@@ -43,7 +43,7 @@ public class hasEntryPerfIT extends Abst
@Test
public void testPerfHasEntry() throws Exception
{
- DN adminDn = new DN( "uid=admin, ou=system" );
+ Dn adminDn = new Dn( "uid=admin, ou=system" );
EntryOperationContext hasEntryContext = new EntryOperationContext( service.getAdminSession(), adminDn );
boolean hasEntry = service.getOperationManager().hasEntry( hasEntryContext );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/list/ListPerfIT.java Sun Jan 23 01:17:06 2011
@@ -27,7 +27,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.interceptor.context.ListOperationContext;
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.Test;
import org.junit.runner.RunWith;
@@ -47,7 +47,7 @@ public class ListPerfIT extends Abstract
@Test
public void testPerfList() throws Exception
{
- ListOperationContext listContext = new ListOperationContext( service.getAdminSession(), new DN( "ou=system" ) );
+ ListOperationContext listContext = new ListOperationContext( service.getAdminSession(), new Dn( "ou=system" ) );
EntryFilteringCursor cursor = service.getOperationManager().list( listContext );
assertNotNull( cursor );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java Sun Jan 23 01:17:06 2011
@@ -78,7 +78,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN, "*") operation
+ * Test a lookup( Dn, "*") operation
*/
@Test
public void testLookupStar() throws Exception
@@ -98,7 +98,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN, "+") operation
+ * Test a lookup( Dn, "+") operation
*/
@Test
@Ignore( "The '+' special attribute is not correctly handled." )
@@ -132,7 +132,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN, []) operation
+ * Test a lookup( Dn, []) operation
*/
@Test
public void testLookupEmptyAtrid() throws Exception
@@ -151,7 +151,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN ) operation
+ * Test a lookup( Dn ) operation
*/
@Test
public void testLookup() throws Exception
@@ -171,7 +171,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN ) operation on the subschema subentry
+ * Test a lookup( Dn ) operation on the subschema subentry
*/
@Test
public void testLookupSubSchemaSubEntry() throws Exception
@@ -190,7 +190,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN ) operation with a list of attributes
+ * Test a lookup( Dn ) operation with a list of attributes
*/
@Test
public void testLookupWithAttrs() throws Exception
@@ -224,7 +224,7 @@ public class LookupIT extends AbstractLd
/**
- * Test a lookup( DN ) operation with no attributes
+ * Test a lookup( Dn ) operation with no attributes
*/
@Test
public void testLookupWithNoAttrs() throws Exception
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java Sun Jan 23 01:17:06 2011
@@ -30,7 +30,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.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -103,13 +103,13 @@ public class LookupPerfIT extends Abstra
/**
- * Test a lookup( DN ) operation with the ACI subsystem enabled
+ * Test a lookup( Dn ) operation with the ACI subsystem enabled
*/
@Test
public void testLookupPerfACIEnabled() throws Exception
{
service.setAccessControlEnabled( true );
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
createAccessControlSubentry( "anybodySearch", "{ " + " identificationTag \"searchAci\", "
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyAddIT.java Sun Jan 23 01:17:06 2011
@@ -264,15 +264,15 @@ public class ModifyAddIT extends Abstrac
//---------------------------------------------------------------------------------------------
// 1 Entry exists
// 1.1 AT does not exist.
- // - new valid AVA, new AT is in MAY
- // - new valid AVA, new AT is not in MAY => error
- // - new valid AVA, new AT is not in MAY, but OC contains extensibleOC
- // - new valid AVA, new AT is not in MAY, but OC contains extensibleOC, legal empty value
- // - new invalid AVA, not existing AT => error
- // - new invalid AVA, existing AT, two values in a single valued AT => error
- // - new invalid AVA, not existing AT, extensibleObject in OCs => error
- // - new invalid AVA (Value is invalid per syntax), AT is in MAY => error
- // - new invalid AVA (Value is invalid per syntax), AT is not in MAY, but OC contains extensibleOC => error
+ // - new valid Ava, new AT is in MAY
+ // - new valid Ava, new AT is not in MAY => error
+ // - new valid Ava, new AT is not in MAY, but OC contains extensibleOC
+ // - new valid Ava, new AT is not in MAY, but OC contains extensibleOC, legal empty value
+ // - new invalid Ava, not existing AT => error
+ // - new invalid Ava, existing AT, two values in a single valued AT => error
+ // - new invalid Ava, not existing AT, extensibleObject in OCs => error
+ // - new invalid Ava (Value is invalid per syntax), AT is in MAY => error
+ // - new invalid Ava (Value is invalid per syntax), AT is not in MAY, but OC contains extensibleOC => error
// - new OperationalAttribute => error
// - new OperationalAttribute, OC contains extensibleOC => error
//---------------------------------------------------------------------------------------------
@@ -331,7 +331,7 @@ public class ModifyAddIT extends Abstrac
// A valid AT not in MUST or MAY, but the extensibleObject OC is present in the OCs
Attributes attrs = new BasicAttributes( "crossCertificatePair", "12345", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
// Verify that the attribute value has been added
@@ -357,7 +357,7 @@ public class ModifyAddIT extends Abstrac
// The value is empty
Attributes attrs = new BasicAttributes( "crossCertificatePair", StringConstants.EMPTY_BYTES, true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
// Verify that the attribute value has been added
@@ -385,7 +385,7 @@ public class ModifyAddIT extends Abstrac
Attributes attrs = new BasicAttributes( "c", true );
attrs.put( attr );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
}
@@ -545,12 +545,12 @@ public class ModifyAddIT extends Abstrac
Attributes attrs = new BasicAttributes( "crossCertificatePair", "12345".getBytes(), true );
- // Add the first AVA
+ // Add the first Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
attrs = new BasicAttributes( "crossCertificatePair", StringConstants.EMPTY_BYTES, true );
- // Add the second AVA
+ // Add the second Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
// Verify that the attribute value has been added
@@ -575,13 +575,13 @@ public class ModifyAddIT extends Abstrac
// The initial value
Attributes attrs = new BasicAttributes( "c", "FR", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
// Add another value
Attributes attrs2 = new BasicAttributes( "c", "US", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
}
@@ -598,13 +598,13 @@ public class ModifyAddIT extends Abstrac
// The initial value
Attributes attrs = new BasicAttributes( "c", "FR", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
// Add another value
Attributes attrs2 = new BasicAttributes( "c", "FR", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs2 );
}
@@ -621,7 +621,7 @@ public class ModifyAddIT extends Abstrac
// The added value
Attributes attrs = new BasicAttributes( "telephoneNumber", "BAD", true );
- // Add the AVA
+ // Add the Ava
sysRoot.modifyAttributes( "ou=testing01", DirContext.ADD_ATTRIBUTE, attrs );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyDelIT.java Sun Jan 23 01:17:06 2011
@@ -290,10 +290,10 @@ public class ModifyDelIT extends Abstrac
//---------------------------------------------------------------------------------------------
// 1 Entry exists
// 1.1 AT exists
- // - The Value exists, it's not part of the RDN, the AT is not singleValued
- // - The Value exists, it's not part of the RDN, the AT is singleValued, the AT is not in MUST
- // - The Value exists, it's not part of the RDN, the AT is singleValued, the AT is in MUST => error
- // - The Value exists, it's part of the RDN => error
+ // - The Value exists, it's not part of the Rdn, the AT is not singleValued
+ // - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is not in MUST
+ // - The Value exists, it's not part of the Rdn, the AT is singleValued, the AT is in MUST => error
+ // - The Value exists, it's part of the Rdn => error
// - The Value does not exists => error
// - Delete all the values, AT is not in MUST => AT must be removed
// - Delete all the values, AT is in MUST => error
@@ -451,7 +451,7 @@ public class ModifyDelIT extends Abstrac
/**
- * Delete an existing AT not part of the RDN, not in MUST
+ * Delete an existing AT not part of the Rdn, not in MUST
*/
@Test
public void testModifyDelExistingEntryExistingATNoInRdnNotInMust() throws Exception
@@ -471,7 +471,7 @@ public class ModifyDelIT extends Abstrac
/**
- * Delete an existing AT not part of the RDN, but in MUST
+ * Delete an existing AT not part of the Rdn, but in MUST
*/
@Test( expected = SchemaViolationException.class )
public void testModifyDelExistingEntryExistingATNoInRdnInMust() throws Exception
@@ -486,7 +486,7 @@ public class ModifyDelIT extends Abstrac
/**
- * Delete an existing AT part of the RDN
+ * Delete an existing AT part of the Rdn
*/
@Test( expected = SchemaViolationException.class )
public void testModifyDelExistingEntryExistingATInRdn() throws Exception
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Sun Jan 23 01:17:06 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ModificationOperation;
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.Test;
import org.junit.runner.RunWith;
@@ -74,7 +74,7 @@ public class ModifyPerfIT extends Abstra
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=test,ou=system" );
+ Dn dn = new Dn( "cn=test,ou=system" );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
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.Test;
import org.junit.runner.RunWith;
@@ -77,7 +77,7 @@ public class MovePerfIT extends Abstract
String oldSuperior = "ou=system";
String newSuperior = "ou=users,ou=system";
- DN dn = new DN( oldDn );
+ Dn dn = new Dn( oldDn );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.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.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
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.Test;
import org.junit.runner.RunWith;
@@ -76,8 +76,8 @@ public class MoveAndRenamePerfIT extends
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN oldDn = new DN( "cn=testOld,ou=system" );
- DN newDn = new DN( "cn=testNew,ou=users,ou=system" );
+ Dn oldDn = new Dn( "cn=testOld,ou=system" );
+ Dn newDn = new Dn( "cn=testNew,ou=users,ou=system" );
Entry entry = new DefaultEntry( service.getSchemaManager(), oldDn );
entry.add( "ObjectClass", "top", "person" );
@@ -118,7 +118,7 @@ public class MoveAndRenamePerfIT extends
long ttt1 = System.nanoTime();
// Swap the dn
- DN tmpDn = newDn;
+ Dn tmpDn = newDn;
newDn = oldDn;
oldDn = tmpDn;
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java Sun Jan 23 01:17:06 2011
@@ -29,7 +29,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.entry.DefaultEntry;
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.Test;
import org.junit.runner.RunWith;
@@ -73,7 +73,7 @@ public class RenamePerfIT extends Abstra
String oldDn ="cn=test0,ou=system";
- DN dn = new DN( oldDn );
+ Dn dn = new Dn( oldDn );
Entry entry = new DefaultEntry( service.getSchemaManager(), dn );
entry.add( "ObjectClass", "top", "person" );
entry.add( "sn", "TEST" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/AliasSearchIT.java Sun Jan 23 01:17:06 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.FilterParser;
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.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -437,7 +437,7 @@ public class AliasSearchIT extends Abstr
{
try
{
- DN base = new DN( "dc=example,dc=com" );
+ Dn base = new Dn( "dc=example,dc=com" );
SearchScope scope = SearchScope.SUBTREE;
ExprNode exprNode = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
@@ -480,7 +480,7 @@ public class AliasSearchIT extends Abstr
{
try
{
- DN base = new DN( "dc=example,dc=com" );
+ Dn base = new Dn( "dc=example,dc=com" );
SearchScope scope = SearchScope.SUBTREE;
ExprNode exprNode = FilterParser.parse( service.getSchemaManager(), "(objectClass=*)" );
AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
@@ -574,7 +574,7 @@ public class AliasSearchIT extends Abstr
List<String> nextResults = new ArrayList<String>();
ExprNode exprNode = FilterParser.parse( service.getSchemaManager(), filter );
- EntryFilteringCursor cursor = service.getAdminSession().search( new DN( base ), scope, exprNode,
+ EntryFilteringCursor cursor = service.getAdminSession().search( new Dn( base ), scope, exprNode,
aliasDerefMode, null );
cursor.beforeFirst();
while ( cursor.next() )
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Sun Jan 23 01:17:06 2011
@@ -68,7 +68,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AliasDerefMode;
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.apache.directory.shared.ldap.schema.AttributeType;
import org.junit.Before;
import org.junit.Test;
@@ -1355,7 +1355,7 @@ public class SearchIT extends AbstractLd
/**
- * Search operation with a base DN with quotes
+ * Search operation with a base Dn with quotes
* Commented as it's not valid by RFC 5514
@Test
public void testSearchWithQuotesInBase() throws NamingException
@@ -1766,7 +1766,7 @@ public class SearchIT extends AbstractLd
{
LdapConnection connection = IntegrationUtils.getAdminConnection( service );
- DN dn = new DN( "cn=testLowerCsnAdd,ou=system" );
+ Dn dn = new Dn( "cn=testLowerCsnAdd,ou=system" );
Entry entry = new DefaultEntry( dn );
entry.add( "objectClass", SchemaConstants.PERSON_OC );
entry.add( "cn", "testLowerCsnAdd_cn" );
@@ -1775,7 +1775,7 @@ public class SearchIT extends AbstractLd
connection.add( entry );
// add an entry to have a entry with higher CSN value
- DN dn2 = new DN( "cn=testHigherCsnAdd,ou=system" );
+ Dn dn2 = new Dn( "cn=testHigherCsnAdd,ou=system" );
Entry entry2 = new DefaultEntry( dn2 );
entry2.add( "objectClass", SchemaConstants.PERSON_OC );
entry2.add( "cn", "testHigherCsnAdd_cn" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java?rev=1062306&r1=1062305&r2=1062306&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java Sun Jan 23 01:17:06 2011
@@ -135,10 +135,10 @@ public final class PartitionIT extends A
/**
- * Given the suffix DN of a partition this method will add an entry, look
+ * Given the suffix Dn of a partition this method will add an entry, look
* it up, then delete it making sure all checks out.
*
- * @param partitionSuffix the DN of the partition suffix
+ * @param partitionSuffix the Dn of the partition suffix
*/
public void addLookupDelete( String partitionSuffix ) throws Exception
{