You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/04/27 23:44:49 UTC
svn commit: r1097253 - in
/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core:
event/ jndi/ operations/compare/ operations/search/ schema/
Author: elecharny
Date: Wed Apr 27 21:44:48 2011
New Revision: 1097253
URL: http://svn.apache.org/viewvc?rev=1097253&view=rev
Log:
o Done some methods renaming in LdifUtils, and forgot to commit those files (or they weren't committed but I didn't saw the error)
Modified:
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Wed Apr 27 21:44:48 2011
@@ -66,7 +66,7 @@ public class EventServiceIT extends Abst
EventDirContext ctx = ( EventDirContext ) getSystemContext( getService() ).lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = LdifUtils.createAttributes(
+ Attributes testEntry = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: organizationalUnit",
"ou", "testentry");
@@ -118,7 +118,7 @@ public class EventServiceIT extends Abst
EventDirContext ctx = ( EventDirContext ) getSystemContext( getService() ).lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = LdifUtils.createAttributes(
+ Attributes testEntry = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: organizationalUnit",
"ou", "testentry" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java Wed Apr 27 21:44:48 2011
@@ -106,7 +106,7 @@ public class AddIT extends AbstractLdapT
{
LdapContext sysRoot = getSystemContext( getService() );
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"ObjectClass: top",
"cn: kevin Spacey",
"dc: ke");
@@ -136,7 +136,7 @@ public class AddIT extends AbstractLdapT
{
LdapContext sysRoot = getSystemContext( getService() );
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"ObjectClass: top",
"ObjectClass: person",
"cn: kevin Spacey",
@@ -164,7 +164,7 @@ public class AddIT extends AbstractLdapT
@Test
public void testAddAttributeWithEscapedPlusCharacter() throws Exception
{
- Attributes entry = LdifUtils.createAttributes(
+ Attributes entry = LdifUtils.createJndiAttributes(
"ObjectClass: top",
"ObjectClass: inetorgperson",
"cn: John\\+Doe",
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=1097253&r1=1097252&r2=1097253&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 Wed Apr 27 21:44:48 2011
@@ -59,7 +59,7 @@ public class CreateContextIT extends Abs
{
protected Attributes getPersonAttributes( String sn, String cn ) throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: person",
"cn", cn,
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java Wed Apr 27 21:44:48 2011
@@ -104,7 +104,7 @@ public class MixedCaseIT extends Abstrac
String dn = "ou=Test";
- Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: organizationalUnit",
"ou: Test" );
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
@@ -130,7 +130,7 @@ public class MixedCaseIT extends Abstrac
String dn = "ou=Test";
String description = "New Value";
- Attributes attributes = LdifUtils.createAttributes("objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createJndiAttributes("objectClass: top", "objectClass: organizationalUnit",
"ou: Test", "description: Old Value");
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
@@ -165,7 +165,7 @@ public class MixedCaseIT extends Abstrac
String dn = "ou=Test";
- Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: organizationalUnit",
"ou: Test" );
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java Wed Apr 27 21:44:48 2011
@@ -119,7 +119,7 @@ public class CompareDirserver1139IT exte
private void injectEntries( LdapContext sysRoot ) throws Exception
{
// Add the group
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"ObjectClass: top",
"ObjectClass: groupOfNames",
"cn: group",
@@ -128,7 +128,7 @@ public class CompareDirserver1139IT exte
sysRoot.createSubcontext( "cn=group,ou=groups", attrs );
// Add the user
- attrs = LdifUtils.createAttributes(
+ attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: organizationalPerson",
"objectClass: person",
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=1097253&r1=1097252&r2=1097253&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 Wed Apr 27 21:44:48 2011
@@ -222,7 +222,7 @@ public class SearchIT extends AbstractLd
*/
private static DirContext addNisPosixGroup( String name, int gid ) throws Exception
{
- Attributes attrs = LdifUtils.createAttributes("objectClass: top", "objectClass: posixGroup", "cn", name,
+ Attributes attrs = LdifUtils.createJndiAttributes("objectClass: top", "objectClass: posixGroup", "cn", name,
"gidNumber", String.valueOf(gid));
return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
@@ -619,7 +619,7 @@ public class SearchIT extends AbstractLd
*/
protected Attributes getPersonAttributes( String sn, String cn ) throws LdapException
{
- Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: top",
+ Attributes attributes = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: top",
"objectClass: person", "cn", cn, "sn", sn );
return attributes;
@@ -1212,7 +1212,7 @@ public class SearchIT extends AbstractLd
public void testSearchWithEscapedCharsInFilter() throws Exception
{
// Create entry cn=Sid Vicious, ou=system
- Attributes vicious = LdifUtils.createAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
+ Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
"sn: Vicious", "description: (sex*pis\\tols)" );
DirContext ctx = sysRoot.createSubcontext( "cn=Sid Vicious", vicious );
@@ -1258,7 +1258,7 @@ public class SearchIT extends AbstractLd
public void testSubstringSearchWithEscapedCharsInFilter() throws Exception
{
// Create entry cn=Sid Vicious, ou=system
- Attributes vicious = LdifUtils.createAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
+ Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
"sn: Vicious", "description: (sex*pis\\tols)" );
DirContext ctx = sysRoot.createSubcontext( "cn=Sid Vicious", vicious );
@@ -1306,7 +1306,7 @@ public class SearchIT extends AbstractLd
@Test
public void testSubstringSearchWithEscapedAsterisksInFilter_DIRSERVER_1181() throws Exception
{
- Attributes vicious = LdifUtils.createAttributes( "objectClass: top", "objectClass: person", "cn: x*y*z*",
+ Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: x*y*z*",
"sn: x*y*z*", "description: (sex*pis\\tols)" );
sysRoot.createSubcontext( "cn=x*y*z*", vicious );
@@ -1528,7 +1528,7 @@ public class SearchIT extends AbstractLd
.getJndiValue() );
// Create an entry which does not match
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: groupOfUniqueNames",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: groupOfUniqueNames",
"cn: testGroup3", "uniqueMember: uid=admin,ou=system" );
getSystemContext( getService() ).createSubcontext( "cn=testGroup3,ou=groups", attrs );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -81,7 +81,7 @@ public class MetaAttributeTypeHandlerIT
@Test
public void testAddAttributeTypeWithoutMatchingRule() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -111,7 +111,7 @@ public class MetaAttributeTypeHandlerIT
@Test
public void testAddAttributeTypeToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -142,7 +142,7 @@ public class MetaAttributeTypeHandlerIT
@Test
public void testAddAttributeTypeToUnLoadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -177,7 +177,7 @@ public class MetaAttributeTypeHandlerIT
@Test
public void testAddAttributeTypeToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -211,7 +211,7 @@ public class MetaAttributeTypeHandlerIT
@Test
public void testAddAttributeTypeDescWithEndingSpace() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -633,7 +633,7 @@ public class MetaAttributeTypeHandlerIT
// ----------------------------------------------------------------------
private void addDependeeAttributeType() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -98,7 +98,7 @@ public class MetaComparatorHandlerIT ext
@Test
public void testAddComparatorToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -124,7 +124,7 @@ public class MetaComparatorHandlerIT ext
@Test
public void testAddComparatorToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -149,7 +149,7 @@ public class MetaComparatorHandlerIT ext
@Test
public void testAddComparatorToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -190,7 +190,7 @@ public class MetaComparatorHandlerIT ext
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator",
"m-fqcn: org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test comparator" );
@@ -225,7 +225,7 @@ public class MetaComparatorHandlerIT ext
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator",
"m-fqcn: org.apache.directory.shared.ldap.model.schema.comparators.DummyComparator", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test comparator" );
@@ -328,7 +328,7 @@ public class MetaComparatorHandlerIT ext
assertTrue( getService().getSchemaManager().getComparatorRegistry().contains( OID ) );
// Create a MR using this comparator
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -81,7 +81,7 @@ public class MetaMatchingRuleHandlerIT e
private void createComparator() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaComparator",
@@ -110,7 +110,7 @@ public class MetaMatchingRuleHandlerIT e
{
createComparator();
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
@@ -140,7 +140,7 @@ public class MetaMatchingRuleHandlerIT e
{
createComparator();
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
@@ -163,7 +163,7 @@ public class MetaMatchingRuleHandlerIT e
{
createComparator();
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -86,7 +86,7 @@ public class MetaNormalizerHandlerIT ext
@Test
public void testAddNormalizerToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -109,7 +109,7 @@ public class MetaNormalizerHandlerIT ext
@Test
public void testAddNormalizerToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -131,7 +131,7 @@ public class MetaNormalizerHandlerIT ext
@Test
public void testAddNormalizerToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -170,7 +170,7 @@ public class MetaNormalizerHandlerIT ext
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -202,7 +202,7 @@ public class MetaNormalizerHandlerIT ext
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -426,7 +426,7 @@ public class MetaNormalizerHandlerIT ext
assertTrue( getService().getSchemaManager().getNormalizerRegistry().contains( OID ) );
// Create a MR using this Normalizer
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -80,7 +80,7 @@ public class MetaObjectClassHandlerIT ex
private Dn addObjectClass() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
@@ -127,7 +127,7 @@ public class MetaObjectClassHandlerIT ex
@Test
public void testAddObjectClassToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
@@ -539,7 +539,7 @@ public class MetaObjectClassHandlerIT ex
private Dn addObjectClassToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -128,7 +128,7 @@ public class MetaSchemaHandlerIT extends
LdapContext schemaRoot = getSchemaContext( getService() );
// Create the schema
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: broken",
@@ -143,7 +143,7 @@ public class MetaSchemaHandlerIT extends
LdapContext schemaRoot = getSchemaContext( getService() );
// Create the schema
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn", schemaName );
@@ -420,7 +420,7 @@ public class MetaSchemaHandlerIT extends
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -448,7 +448,7 @@ public class MetaSchemaHandlerIT extends
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -482,7 +482,7 @@ public class MetaSchemaHandlerIT extends
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -544,7 +544,7 @@ public class MetaSchemaHandlerIT extends
public void testAddDisabledSchemaNoDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -568,7 +568,7 @@ public class MetaSchemaHandlerIT extends
public void testAddDisabledSchemaWithDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -594,7 +594,7 @@ public class MetaSchemaHandlerIT extends
public void testRejectDisabledSchemaAddWithMissingDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -635,7 +635,7 @@ public class MetaSchemaHandlerIT extends
public void testAddEnabledSchemaNoDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaSchema",
"cn: dummy"
@@ -659,7 +659,7 @@ public class MetaSchemaHandlerIT extends
public void testRejectEnabledSchemaAddWithDisabledDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -763,7 +763,7 @@ public class MetaSchemaHandlerIT extends
{
LdapContext schemaRoot = getSchemaContext( getService() );
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -813,7 +813,7 @@ public class MetaSchemaHandlerIT extends
testEnableExistingSchema();
// adds enabled dummy schema that depends on the test schema
- Attributes dummySchema = LdifUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -84,7 +84,7 @@ public class MetaSyntaxCheckerHandlerIT
@Test
public void testAddSyntaxCheckerToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID,
"m-description: A test syntaxChecker" );
@@ -103,7 +103,7 @@ public class MetaSyntaxCheckerHandlerIT
@Test
public void testAddSyntaxCheckerToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID,
"m-description: A test syntaxChecker" );
@@ -121,7 +121,7 @@ public class MetaSyntaxCheckerHandlerIT
@Test
public void testAddSyntaxCheckerToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntaxChecker", "m-fqcn", OctetStringSyntaxChecker.class.getName(), "m-oid", OID,
"m-description: A test syntaxChecker" );
@@ -156,7 +156,7 @@ public class MetaSyntaxCheckerHandlerIT
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntaxChecker", "m-fqcn",
"org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker" );
@@ -184,7 +184,7 @@ public class MetaSyntaxCheckerHandlerIT
out.write( in.read() );
}
- Attributes attrs = LdifUtils.createAttributes("objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes("objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntaxChecker", "m-fqcn",
"org.apache.directory.shared.ldap.model.schema.syntaxCheckers.DummySyntaxChecker", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test syntaxChecker");
@@ -404,7 +404,7 @@ public class MetaSyntaxCheckerHandlerIT
assertTrue( getService().getSchemaManager().getSyntaxCheckerRegistry().contains( OID ) );
// Create a Syntax using this comparator
- Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaSyntax", "m-oid", OID, "m-description: test" );
Dn sDn = getSyntaxContainer( "apachemeta" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=1097253&r1=1097252&r2=1097253&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Wed Apr 27 21:44:48 2011
@@ -97,7 +97,7 @@ public class MetaSyntaxHandlerIT extends
@Test
public void testAddSyntaxToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -119,7 +119,7 @@ public class MetaSyntaxHandlerIT extends
@Test
public void testAddSyntaxToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -141,7 +141,7 @@ public class MetaSyntaxHandlerIT extends
@Test
public void testAddSyntaxToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -443,7 +443,7 @@ public class MetaSyntaxHandlerIT extends
private void addDependeeMatchingRule( String oid ) throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createJndiAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",