Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Fri Aug 6 14:28:50 2010
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.schema;
@@ -46,6 +46,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -94,92 +95,92 @@ public class MetaSyntaxHandlerIT extends
@Test
public void testAddSyntaxToEnabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
"m-oid", OID,
"m-description", DESCRIPTION0 );
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
-
+
createDummySyntaxChecker( OID, "apachemeta" );
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attrs );
-
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
+
assertTrue( schemaManager.getLdapSyntaxRegistry().contains( OID ) );
assertEquals( schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
assertTrue( isOnDisk( dn ) );
}
-
-
+
+
@Test
public void testAddSyntaxToDisabledSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
"m-oid", OID,
"m-description", DESCRIPTION0 );
-
+
// nis is by default inactive
DN dn = getSyntaxContainer( "nis" );
dn = dn.add( "m-oid" + "=" + OID );
createDummySyntaxChecker( OID, "nis" );
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attrs );
-
- assertFalse( "adding new syntax to disabled schema should not register it into the registries",
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
+
+ assertFalse( "adding new syntax to disabled schema should not register it into the registries",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
assertTrue( isOnDisk( dn ) );
}
-
+
@Test
public void testAddSyntaxToUnloadedSchema() throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
"m-oid", OID,
"m-description", DESCRIPTION0 );
-
+
// nis is by default inactive
DN dn = getSyntaxContainer( "notloaded" );
dn = dn.add( "m-oid" + "=" + OID );
createDummySyntaxChecker( OID, "nis" );
-
+
try
{
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attrs );
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
fail( "Should not be there" );
}
catch( NameNotFoundException nnfe )
{
// Expected result.
}
-
- assertFalse( "adding new syntax to disabled schema should not register it into the registries",
+
+ assertFalse( "adding new syntax to disabled schema should not register it into the registries",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
assertFalse( isOnDisk( dn ) );
}
-
-
+
+
@Test
public void testDeleteSyntaxFromEnabledSchema() throws Exception
{
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
testAddSyntaxToEnabledSchema();
-
+
assertTrue( isOnDisk( dn ) );
- assertTrue( "syntax should be removed from the registry after being deleted",
+ assertTrue( "syntax should be removed from the registry after being deleted",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- getSchemaContext( service ).destroySubcontext( DN.toName( dn ) );
- assertFalse( "syntax should be removed from the registry after being deleted",
+ getSchemaContext( service ).destroySubcontext( JndiUtils.toName( dn ) );
+
+ assertFalse( "syntax should be removed from the registry after being deleted",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
try
@@ -203,12 +204,12 @@ public class MetaSyntaxHandlerIT extends
testAddSyntaxToDisabledSchema();
assertTrue( isOnDisk( dn ) );
- assertFalse( "syntax should be removed from the registry after being deleted",
+ assertFalse( "syntax should be removed from the registry after being deleted",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
- getSchemaContext( service ).destroySubcontext( DN.toName( dn ) );
+ getSchemaContext( service ).destroySubcontext( JndiUtils.toName( dn ) );
- assertFalse( "syntax should be removed from the registry after being deleted",
+ assertFalse( "syntax should be removed from the registry after being deleted",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
try
@@ -219,7 +220,7 @@ public class MetaSyntaxHandlerIT extends
catch( LdapException e )
{
}
-
+
assertFalse( isOnDisk( dn ) );
}
@@ -231,12 +232,12 @@ public class MetaSyntaxHandlerIT extends
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
testAddSyntaxToEnabledSchema();
-
+
DN newdn = getSyntaxContainer( "apachemeta" );
newdn = newdn.add( "m-oid" + "=" + NEW_OID );
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
- assertFalse( "old syntax OID should be removed from the registry after being renamed",
+ assertFalse( "old syntax OID should be removed from the registry after being renamed",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
//noinspection EmptyCatchBlock
@@ -258,19 +259,19 @@ public class MetaSyntaxHandlerIT extends
public void testMoveSyntax() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN newdn = getSyntaxContainer( "apache" );
newdn = newdn.add( "m-oid" + "=" + OID );
-
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
- assertTrue( "syntax OID should still be present",
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+
+ assertTrue( "syntax OID should still be present",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- assertEquals( "syntax schema should be set to apache not apachemeta",
+
+ assertEquals( "syntax schema should be set to apache not apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ), "apache" );
}
@@ -280,86 +281,86 @@ public class MetaSyntaxHandlerIT extends
public void testMoveSyntaxAndChangeRdn() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN newdn = getSyntaxContainer( "apache" );
newdn = newdn.add( "m-oid" + "=" + NEW_OID );
-
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
- assertFalse( "old syntax OID should NOT be present",
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+
+ assertFalse( "old syntax OID should NOT be present",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- assertTrue( "new syntax OID should be present",
+
+ assertTrue( "new syntax OID should be present",
schemaManager.getLdapSyntaxRegistry().contains( NEW_OID ) );
-
- assertEquals( "syntax with new oid should have schema set to apache NOT apachemeta",
+
+ assertEquals( "syntax with new oid should have schema set to apache NOT apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( NEW_OID ), "apache" );
}
-
+
@Test
@Ignore
public void testModifySyntaxWithModificationItems() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION0 );
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
-
+
ModificationItem[] mods = new ModificationItem[1];
Attribute attr = new BasicAttribute( "m-description", DESCRIPTION1 );
mods[0] = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, attr );
- getSchemaContext( service ).modifyAttributes( DN.toName( dn ), mods );
+ getSchemaContext( service ).modifyAttributes( JndiUtils.toName( dn ), mods );
- assertTrue( "syntax OID should still be present",
+ assertTrue( "syntax OID should still be present",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- assertEquals( "syntax schema should be set to apachemeta",
+
+ assertEquals( "syntax schema should be set to apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
-
+
syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION1 );
}
-
+
@Test
@Ignore
public void testModifySyntaxWithAttributes() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
LdapSyntax syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION0 );
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
-
+
Attributes mods = new BasicAttributes( true );
mods.put( "m-description", DESCRIPTION1 );
- getSchemaContext( service ).modifyAttributes( DN.toName( dn ), DirContext.REPLACE_ATTRIBUTE, mods );
+ getSchemaContext( service ).modifyAttributes( JndiUtils.toName( dn ), DirContext.REPLACE_ATTRIBUTE, mods );
- assertTrue( "syntax OID should still be present",
+ assertTrue( "syntax OID should still be present",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- assertEquals( "syntax schema should be set to apachemeta",
+
+ assertEquals( "syntax schema should be set to apachemeta",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
syntax = schemaManager.getLdapSyntaxRegistry().lookup( OID );
assertEquals( syntax.getDescription(), DESCRIPTION1 );
}
-
+
// ----------------------------------------------------------------------
// Test move, rename, and delete when a MR exists and uses the Normalizer
// ----------------------------------------------------------------------
-
+
@Test
public void testDeleteSyntaxWhenInUse() throws Exception
{
@@ -367,45 +368,45 @@ public class MetaSyntaxHandlerIT extends
dn = dn.add( "m-oid" + "=" + OID );
testAddSyntaxToEnabledSchema();
addDependeeMatchingRule( OID );
-
+
try
{
- getSchemaContext( service ).destroySubcontext( DN.toName( dn ) );
+ getSchemaContext( service ).destroySubcontext( JndiUtils.toName( dn ) );
fail( "should not be able to delete a syntax in use" );
}
- catch( OperationNotSupportedException e )
+ catch( OperationNotSupportedException e )
{
}
- assertTrue( "syntax should still be in the registry after delete failure",
+ assertTrue( "syntax should still be in the registry after delete failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
-
-
+
+
@Test
@Ignore
public void testMoveSyntaxWhenInUse() throws Exception
{
testAddSyntaxToEnabledSchema();
addDependeeMatchingRule( OID );
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN newdn = getSyntaxContainer( "apache" );
newdn = newdn.add( "m-oid" + "=" + OID );
-
+
try
{
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
fail( "should not be able to move a syntax in use" );
}
- catch( LdapUnwillingToPerformException e )
+ catch( LdapUnwillingToPerformException e )
{
assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
}
- assertTrue( "syntax should still be in the registry after move failure",
+ assertTrue( "syntax should still be in the registry after move failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
@@ -416,47 +417,47 @@ public class MetaSyntaxHandlerIT extends
{
testAddSyntaxToEnabledSchema();
addDependeeMatchingRule( OID );
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN newdn = getSyntaxContainer( "apache" );
newdn = newdn.add( "m-oid" + "=" + NEW_OID );
-
+
try
{
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
fail( "should not be able to move a syntax in use" );
}
- catch( LdapUnwillingToPerformException e )
+ catch( LdapUnwillingToPerformException e )
{
assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
}
- assertTrue( "syntax should still be in the registry after move failure",
+ assertTrue( "syntax should still be in the registry after move failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
-
+
private void addDependeeMatchingRule( String oid ) throws Exception
{
- Attributes attrs = LdifUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
"m-oid", MR_OID,
"m-syntax", OID,
"m-description", MR_DESCRIPTION );
-
+
DN dn = getMatchingRuleContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + MR_OID );
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attrs );
-
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attrs );
+
assertTrue( schemaManager.getMatchingRuleRegistry().contains( MR_OID ) );
assertEquals( schemaManager.getMatchingRuleRegistry().getSchemaName( MR_OID ), "apachemeta" );
}
-
+
@Test
@Ignore
public void testRenameNormalizerWhenInUse() throws Exception
@@ -465,21 +466,21 @@ public class MetaSyntaxHandlerIT extends
dn = dn.add( "m-oid" + "=" + OID );
testAddSyntaxToEnabledSchema();
addDependeeMatchingRule( OID );
-
+
DN newdn = getSyntaxContainer( "apachemeta" );
newdn = newdn.add( "m-oid" + "=" + NEW_OID );
-
+
try
{
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
fail( "should not be able to rename a syntax in use" );
}
- catch( LdapUnwillingToPerformException e )
+ catch( LdapUnwillingToPerformException e )
{
assertEquals( e.getResultCode(), ResultCodeEnum.UNWILLING_TO_PERFORM );
}
- assertTrue( "syntax should still be in the registry after rename failure",
+ assertTrue( "syntax should still be in the registry after rename failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
@@ -494,24 +495,24 @@ public class MetaSyntaxHandlerIT extends
public void testMoveSyntaxToTop() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN top = new DN();
top.add( "m-oid" + "=" + OID );
-
+
try
{
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( top ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( top ) );
fail( "should not be able to move a syntax up to ou=schema" );
}
- catch( LdapInvalidDnException e )
+ catch( LdapInvalidDnException e )
{
assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
}
- assertTrue( "syntax should still be in the registry after move failure",
+ assertTrue( "syntax should still be in the registry after move failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
@@ -521,44 +522,44 @@ public class MetaSyntaxHandlerIT extends
public void testMoveSyntaxToComparatorContainer() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
DN newdn = new DN( "ou=comparators,cn=apachemeta" );
newdn = newdn.add( "m-oid" + "=" + OID );
-
+
try
{
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
fail( "should not be able to move a syntax into comparators container" );
}
- catch( LdapInvalidDnException e )
+ catch( LdapInvalidDnException e )
{
assertEquals( e.getResultCode(), ResultCodeEnum.NAMING_VIOLATION );
}
- assertTrue( "syntax should still be in the registry after move failure",
+ assertTrue( "syntax should still be in the registry after move failure",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
-
-
+
+
@Test
@Ignore
public void testMoveSyntaxToDisabledSchema() throws Exception
{
testAddSyntaxToEnabledSchema();
-
+
DN dn = getSyntaxContainer( "apachemeta" );
dn = dn.add( "m-oid" + "=" + OID );
// nis is inactive by default
DN newdn = getSyntaxContainer( "nis" );
newdn = newdn.add( "m-oid" + "=" + OID );
-
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
- assertFalse( "syntax OID should no longer be present",
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+
+ assertFalse( "syntax OID should no longer be present",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
}
@@ -568,23 +569,23 @@ public class MetaSyntaxHandlerIT extends
public void testMoveSyntaxToEnabledSchema() throws Exception
{
testAddSyntaxToDisabledSchema();
-
+
// nis is inactive by default
DN dn = getSyntaxContainer( "nis" );
dn = dn.add( "m-oid" + "=" + OID );
- assertFalse( "syntax OID should NOT be present when added to disabled nis schema",
+ assertFalse( "syntax OID should NOT be present when added to disabled nis schema",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
DN newdn = getSyntaxContainer( "apachemeta" );
newdn = newdn.add( "m-oid" + "=" + OID );
-
- getSchemaContext( service ).rename( DN.toName( dn ), DN.toName( newdn ) );
- assertTrue( "syntax OID should be present when moved to enabled schema",
+ getSchemaContext( service ).rename( JndiUtils.toName( dn ), JndiUtils.toName( newdn ) );
+
+ assertTrue( "syntax OID should be present when moved to enabled schema",
schemaManager.getLdapSyntaxRegistry().contains( OID ) );
-
- assertEquals( "syntax should be in apachemeta schema after move",
+
+ assertEquals( "syntax should be in apachemeta schema after move",
schemaManager.getLdapSyntaxRegistry().getSchemaName( OID ), "apachemeta" );
}
@@ -592,32 +593,32 @@ public class MetaSyntaxHandlerIT extends
private void createDummySyntaxChecker( String oid, String schema ) throws Exception
{
List<String> descriptions = new ArrayList<String>();
- descriptions.add( "( " + oid + " DESC 'bogus desc' FQCN " + OctetStringSyntaxChecker.class.getName()
+ descriptions.add( "( " + oid + " DESC 'bogus desc' FQCN " + OctetStringSyntaxChecker.class.getName()
+ " X-SCHEMA '" + schema + "' )" );
modify( DirContext.ADD_ATTRIBUTE, descriptions, "syntaxCheckers" );
}
-
-
+
+
private void modify( int op, List<String> descriptions, String opAttr ) throws Exception
{
DN dn = new DN( getSubschemaSubentryDN(), service.getSchemaManager() );
Attribute attr = new BasicAttribute( opAttr );
-
+
for ( String description : descriptions )
{
attr.add( description );
}
-
+
Attributes mods = new BasicAttributes( true );
mods.put( attr );
-
- getRootContext( service ).modifyAttributes( DN.toName( dn ), op, mods );
+
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), op, mods );
}
-
-
+
+
/**
* Get's the subschemaSubentry attribute value from the rootDSE.
- *
+ *
* @return the subschemaSubentry distinguished name
* @throws Exception if there are problems accessing the RootDSE
*/
@@ -626,7 +627,7 @@ public class MetaSyntaxHandlerIT extends
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.OBJECT_SCOPE );
controls.setReturningAttributes( new String[]{ SUBSCHEMA_SUBENTRY } );
-
+
NamingEnumeration<SearchResult> results = getRootContext( service ).search(
"", "(objectClass=*)", controls );
SearchResult result = results.next();
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Fri Aug 6 14:28:50 2010
@@ -41,6 +41,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,39 +60,39 @@ public class ObjectClassCreateIT extends
//--------------------------------------------------------------------
Attributes attributes = new BasicAttributes( true );
Attribute objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
objectClassAttribute.add( "top" );
objectClassAttribute.add( "metaTop" );
objectClassAttribute.add( "metaAttributeType" );
-
+
attributes.put( objectClassAttribute );
-
+
attributes.put( "m-oid", "2.16.840.1.113730.3.2.22.249" );
-
+
// The name
attributes.put( "m-name", "accountStatus" );
-
+
// The Obsolete flag
attributes.put( "m-obsolete", "FALSE" );
-
+
// The single value flag
attributes.put( "m-singleValue", "TRUE" );
-
+
// The collective flag
attributes.put( "m-collective", "FALSE" );
-
+
// The noUserModification flag
attributes.put( "m-noUserModification", "FALSE" );
// The usage
attributes.put( "m-usage", "USER_APPLICATIONS" );
-
+
// The equality matching rule
attributes.put( "m-equality", "caseIgnoreMatch" );
-
+
// The substr matching rule
attributes.put( "m-substr", "caseIgnoreSubstringsMatch" );
-
+
// The syntax
attributes.put( "m-syntax", "1.3.6.1.4.1.1466.115.121.1.15" );
@@ -100,33 +101,33 @@ public class ObjectClassCreateIT extends
// The description
attributes.put( "m-description", "Account Status" );
-
+
// Inject the AT
DN dn = new DN( "ou=attributeTypes,cn=apachemeta" );
dn = dn.add( MetaSchemaConstants.M_OID_AT + "=2.16.840.1.113730.3.2.22.249" );
-
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attributes );
-
+
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attributes );
+
//--------------------------------------------------------------------
// The extendPerson OC
//--------------------------------------------------------------------
attributes = new BasicAttributes( true );
objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
objectClassAttribute.add( "top" );
objectClassAttribute.add( "metaTop" );
objectClassAttribute.add( "metaObjectClass" );
-
+
attributes.put( objectClassAttribute );
-
+
attributes.put( "m-oid", "2.16.840.1.113730.3.2.22" );
-
+
// The name
attributes.put( "m-name", "extendPerson" );
-
+
// The Obsolete flag
attributes.put( "m-obsolete", "FALSE" );
-
+
// The Type list
attributes.put( "m-typeObjectClass", "STRUCTURAL" );
@@ -135,15 +136,15 @@ public class ObjectClassCreateIT extends
// The description
attributes.put( "m-description", "Extended InetOrgPerson" );
-
+
// The MAY list
attributes.put( "m-may", "accountStatus" );
-
+
// Inject the OC
dn = new DN( "ou=objectClasses,cn=apachemeta" );
dn = dn.add( MetaSchemaConstants.M_OID_AT + "=2.16.840.1.113730.3.2.22" );
-
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attributes );
+
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attributes );
}
/**
@@ -167,24 +168,24 @@ public class ObjectClassCreateIT extends
{
Attributes attributes = new BasicAttributes( true );
Attribute objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
objectClassAttribute.add( "top" );
objectClassAttribute.add( "metaTop" );
objectClassAttribute.add( "metaObjectClass" );
-
+
attributes.put( objectClassAttribute );
-
+
attributes.put( "m-oid", "testOID" );
-
+
// This name is invalid
attributes.put( "m-name", "http://example.com/users/accounts/L0" );
-
+
DN dn = getObjectClassContainer( "apachemeta" );
dn = dn.add( MetaSchemaConstants.M_OID_AT + "=" + testOID );
-
+
try
{
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attributes );
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attributes );
fail(); // Should not reach this point
}
catch ( NamingException ne )
@@ -201,25 +202,25 @@ public class ObjectClassCreateIT extends
{
Attributes attributes = new BasicAttributes( true );
Attribute objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
objectClassAttribute.add( "top" );
objectClassAttribute.add( "metaTop" );
objectClassAttribute.add( "metaObjectClass" );
-
+
// Don't put the objectclasses in the entry : this is on purpose !
// attributes.put( objectClassAttribute );
-
+
attributes.put( "m-oid", "testOID" );
-
+
// This name is invalid
attributes.put( "m-name", "no-objectClasses" );
-
+
DN dn = getObjectClassContainer( "apachemeta" );
dn = dn.add( MetaSchemaConstants.M_OID_AT + "=" + testOID );
-
+
try
{
- getSchemaContext( service ).createSubcontext( DN.toName( dn ), attributes );
+ getSchemaContext( service ).createSubcontext( JndiUtils.toName( dn ), attributes );
fail(); // Should not reach this point
}
catch ( NamingException ne )
@@ -227,8 +228,8 @@ public class ObjectClassCreateIT extends
assertTrue( true );
}
}
-
-
+
+
/**
* Test that if we create an OC with a superior OC then the AT are correctly
* inherited.
@@ -237,29 +238,29 @@ public class ObjectClassCreateIT extends
public void testCreateOCWithSuperior() throws Exception
{
injectSchema();
-
+
// Now, check that we can add entries with this new OC
Attributes entry = new BasicAttributes( true );
Attribute objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
// The ObjectClass
objectClassAttribute.add( "top" );
objectClassAttribute.add( "extendPerson" );
-
+
entry.put( objectClassAttribute );
-
+
// Mandatory attributes -- required in MUST list
entry.put( "uid", "test" );
- entry.put( "sn", "test" );
+ entry.put( "sn", "test" );
entry.put( "givenName", "test" );
- entry.put( "cn", "test" );
+ entry.put( "cn", "test" );
entry.put( "displayName", "test-test" );
entry.put( "initials", "tt" );
entry.put( "accountStatus", "test" );
-
+
// Create the context
DirContext system = getSystemContext( service );
-
+
try
{
system.createSubcontext( "cn=test", entry );
@@ -268,41 +269,41 @@ public class ObjectClassCreateIT extends
{
fail();
}
-
+
}
-
-
+
+
/**
- * Test that if we create an AT with an ancestor, we can search and
+ * Test that if we create an AT with an ancestor, we can search and
* get back the entry using its ancestor
*/
@Test
public void testCreateATWithSuperior() throws Exception
{
injectSchema();
-
+
// Now, check that we can add entries with this new AT
Attributes entry = new BasicAttributes( true );
Attribute objectClassAttribute = new BasicAttribute( "objectClass" );
-
+
// The ObjectClass
objectClassAttribute.add( "top" );
objectClassAttribute.add( "extendPerson" );
-
+
entry.put( objectClassAttribute );
-
+
// Mandatory attributes -- required in MUST list
entry.put( "uid", "test" );
- entry.put( "sn", "test" );
+ entry.put( "sn", "test" );
entry.put( "givenName", "test" );
- entry.put( "cn", "test" );
+ entry.put( "cn", "test" );
entry.put( "displayName", "test-test" );
entry.put( "initials", "tt" );
entry.put( "accountStatus", "accountStatusValue" );
-
+
// Create the context
DirContext system = getSystemContext( service );
-
+
try
{
system.createSubcontext( "cn=test", entry );
@@ -311,12 +312,12 @@ public class ObjectClassCreateIT extends
{
fail();
}
-
+
SearchControls sc = new SearchControls();
NamingEnumeration<SearchResult> result = system.search( "", "(name=accountStatusValue)", sc );
boolean found = false;
-
+
while ( result.hasMore() )
{
assertFalse( found );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Fri Aug 6 14:28:50 2010
@@ -46,6 +46,7 @@ import javax.naming.directory.SearchResu
import org.apache.directory.server.core.annotations.CreateDS;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
@@ -147,7 +148,7 @@ public class SchemaPersistenceIT extends
Attributes mods = new BasicAttributes( true );
mods.put( attr );
- getRootContext( service ).modifyAttributes( DN.toName( dn ), op, mods );
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), op, mods );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Fri Aug 6 14:28:50 2010
@@ -66,6 +66,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -1411,7 +1412,7 @@ public class SubschemaSubentryIT extends
mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
- getRootContext( service ).modifyAttributes( DN.toName( dn ), mods );
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), mods );
Attributes attrs = getSubschemaSubentryAttributes();
Attribute attrTypes = attrs.get( "attributeTypes" );
@@ -1465,7 +1466,7 @@ public class SubschemaSubentryIT extends
mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
- getRootContext( service ).modifyAttributes( DN.toName( dn ), mods );
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), mods );
Attributes attrs = getSubschemaSubentryAttributes();
Attribute attrTypes = attrs.get( "attributeTypes" );
@@ -1898,7 +1899,7 @@ public class SubschemaSubentryIT extends
mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
- getRootContext( service ).modifyAttributes( DN.toName( dn ), mods );
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), mods );
// now check the modification timestamp and the modifiers name
@@ -1952,7 +1953,7 @@ public class SubschemaSubentryIT extends
"DESC 'bogus description' SUP name SINGLE-VALUE X-SCHEMA 'nis' )";
mods[0] = new ModificationItem( DirContext.ADD_ATTRIBUTE,
new BasicAttribute( "attributeTypes", substrate ) );
- ctx.modifyAttributes( DN.toName( dn ), mods );
+ ctx.modifyAttributes( JndiUtils.toName( dn ), mods );
// now let's verify the new values for the modification attributes
@@ -1997,7 +1998,7 @@ public class SubschemaSubentryIT extends
modifications[i++] = new ModificationItem( op, new BasicAttribute( opAttr, description ) );
}
- getRootContext( service ).modifyAttributes( DN.toName( dn ), modifications );
+ getRootContext( service ).modifyAttributes( JndiUtils.toName( dn ), modifications );
}
Propchange: directory/apacheds/branches/apacheds-codec-merge/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
-/directory/apacheds/trunk/core-jndi:980025-980137
+/directory/apacheds/trunk/core-jndi:980025-980137,982368-982968
Modified: directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Fri Aug 6 14:28:50 2010
@@ -202,7 +202,7 @@ public abstract class ServerContext impl
public ServerContext( DirectoryService service, LdapPrincipal principal, Name name ) throws Exception
{
this.service = service;
- this.dn = DN.fromName( name );
+ this.dn = JndiUtils.fromName( name );
this.env = new Hashtable<String, Object>();
this.env.put( PROVIDER_URL, dn.toString() );
@@ -225,7 +225,7 @@ public abstract class ServerContext impl
public ServerContext( DirectoryService service, CoreSession session, Name name ) throws Exception
{
this.service = service;
- this.dn = DN.fromName( name );
+ this.dn = JndiUtils.fromName( name );
this.env = new Hashtable<String, Object>();
this.env.put( PROVIDER_URL, dn.toString() );
this.env.put( DirectoryService.JNDI_KEY, service );
@@ -730,7 +730,7 @@ public abstract class ServerContext impl
*/
public Context createSubcontext( Name name ) throws NamingException
{
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
Entry serverEntry = null;
try
@@ -792,7 +792,7 @@ public abstract class ServerContext impl
try
{
- ctx = new ServerLdapContext( service, session.getEffectivePrincipal(), DN.toName( target ) );
+ ctx = new ServerLdapContext( service, session.getEffectivePrincipal(), JndiUtils.toName( target ) );
}
catch ( Exception e )
{
@@ -817,7 +817,7 @@ public abstract class ServerContext impl
*/
public void destroySubcontext( Name name ) throws NamingException
{
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
if ( target.size() == 0 )
{
@@ -871,7 +871,7 @@ public abstract class ServerContext impl
// First, use state factories to do a transformation
DirStateFactory.Result res = DirectoryManager.getStateToBind( obj, name, this, env, null );
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
// let's be sure that the Attributes is case insensitive
Entry outServerEntry = null;
@@ -1033,8 +1033,8 @@ public abstract class ServerContext impl
*/
public void rename( Name oldName, Name newName ) throws NamingException
{
- DN oldDn = buildTarget( DN.fromName( oldName ) );
- DN newDn = buildTarget( DN.fromName( newName ) );
+ DN oldDn = buildTarget( JndiUtils.fromName( oldName ) );
+ DN newDn = buildTarget( JndiUtils.fromName( newName ) );
if ( oldDn.size() == 0 )
{
@@ -1141,7 +1141,7 @@ public abstract class ServerContext impl
*/
public void rebind( Name name, Object obj ) throws NamingException
{
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
OperationManager operationManager = service.getOperationManager();
try
@@ -1176,7 +1176,7 @@ public abstract class ServerContext impl
{
try
{
- doDeleteOperation( buildTarget( DN.fromName( name ) ) );
+ doDeleteOperation( buildTarget( JndiUtils.fromName( name ) ) );
}
catch ( Exception e )
{
@@ -1207,7 +1207,7 @@ public abstract class ServerContext impl
public Object lookup( Name name ) throws NamingException
{
Object obj;
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
Entry serverEntry = null;
@@ -1257,7 +1257,7 @@ public abstract class ServerContext impl
try
{
- ctx = new ServerLdapContext( service, session.getEffectivePrincipal(), DN.toName( target ) );
+ ctx = new ServerLdapContext( service, session.getEffectivePrincipal(), JndiUtils.toName( target ) );
}
catch ( Exception e )
{
@@ -1302,7 +1302,7 @@ public abstract class ServerContext impl
{
try
{
- return DN.toName( new DN( name ) );
+ return JndiUtils.toName( new DN( name ) );
}
catch ( LdapInvalidDnException lide )
{
@@ -1329,7 +1329,7 @@ public abstract class ServerContext impl
{
try
{
- return DN.toName( new DN( name.toString() ) );
+ return JndiUtils.toName( new DN( name.toString() ) );
}
catch ( LdapInvalidDnException lide )
{
@@ -1360,7 +1360,7 @@ public abstract class ServerContext impl
{
try
{
- return new NamingEnumerationAdapter( doListOperation( buildTarget( DN.fromName( name ) ) ) );
+ return new NamingEnumerationAdapter( doListOperation( buildTarget( JndiUtils.fromName( name ) ) ) );
}
catch ( Exception e )
{
@@ -1389,7 +1389,7 @@ public abstract class ServerContext impl
public NamingEnumeration listBindings( Name name ) throws NamingException
{
// Conduct a special one level search at base for all objects
- DN base = buildTarget( DN.fromName( name ) );
+ DN base = buildTarget( JndiUtils.fromName( name ) );
PresenceNode filter = new PresenceNode( OBJECT_CLASS_AT );
SearchControls ctls = new SearchControls();
ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -1443,7 +1443,7 @@ public abstract class ServerContext impl
*/
// 1). Find the Dn for name and walk it from the head to tail
- DN fqn = buildTarget( DN.fromName( name ) );
+ DN fqn = buildTarget( JndiUtils.fromName( name ) );
String head = prefix.get( 0 );
// 2). Walk the fqn trying to match for the head of the prefix
@@ -1452,7 +1452,7 @@ public abstract class ServerContext impl
// match found end loop
if ( fqn.get( 0 ).equalsIgnoreCase( head ) )
{
- return DN.toName( fqn );
+ return JndiUtils.toName( fqn );
}
else
// 2). Remove name components from the Dn until a match
@@ -1488,7 +1488,7 @@ public abstract class ServerContext impl
criteria.setFilter( filter );
criteria.setScope( SearchScope.getSearchScope( scope ) );
criteria.setAliasDerefMode( AliasDerefMode.getEnum( env ) );
- criteria.setBase( buildTarget( DN.fromName( name ) ) );
+ criteria.setBase( buildTarget( JndiUtils.fromName( name ) ) );
service.getEventService().addListener( listener );
listeners.put( namingListener, listener );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Fri Aug 6 14:28:50 2010
@@ -149,7 +149,7 @@ public abstract class ServerDirContext e
try
{
- attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( DN.fromName( name ) ) ) );
+ attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( JndiUtils.fromName( name ) ) ) );
}
catch ( Exception e )
{
@@ -179,7 +179,7 @@ public abstract class ServerDirContext e
Attributes attrs = null;
try
{
- attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( DN.fromName( name ) ), attrIds ) );
+ attrs = ServerEntryUtils.toBasicAttributes( doLookupOperation( buildTarget( JndiUtils.fromName( name ) ), attrIds ) );
}
catch ( Exception e )
{
@@ -238,7 +238,7 @@ public abstract class ServerDirContext e
try
{
- doModifyOperation( buildTarget( DN.fromName( name ) ), newMods );
+ doModifyOperation( buildTarget( JndiUtils.fromName( name ) ), newMods );
}
catch( Exception e )
{
@@ -277,7 +277,7 @@ public abstract class ServerDirContext e
try
{
- doModifyOperation( buildTarget( DN.fromName( name ) ), newMods );
+ doModifyOperation( buildTarget( JndiUtils.fromName( name ) ), newMods );
}
catch ( Exception e )
{
@@ -306,7 +306,7 @@ public abstract class ServerDirContext e
try
{
- doModifyOperation( buildTarget( DN.fromName( name ) ), newMods );
+ doModifyOperation( buildTarget( JndiUtils.fromName( name ) ), newMods );
}
catch ( Exception e )
{
@@ -343,7 +343,7 @@ public abstract class ServerDirContext e
return;
}
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
Entry serverEntry = null;
@@ -526,7 +526,7 @@ public abstract class ServerDirContext e
*/
public void rebind( Name name, Object obj, Attributes attrs ) throws NamingException
{
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
try
{
@@ -566,7 +566,7 @@ public abstract class ServerDirContext e
return ( DirContext ) super.createSubcontext( name );
}
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
RDN rdn = target.getRdn( target.size() - 1 );
attrs = AttributeUtils.toCaseInsensitive( attrs );
@@ -626,7 +626,7 @@ public abstract class ServerDirContext e
try
{
- ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), DN.toName( target ) );
+ ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), JndiUtils.toName( target ) );
}
catch ( Exception e )
{
@@ -717,7 +717,7 @@ public abstract class ServerDirContext e
throws NamingException
{
SearchControls ctls = new SearchControls();
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
// If we need to return specific attributes add em to the SearchControls
if ( null != attributesToReturn )
@@ -861,7 +861,7 @@ public abstract class ServerDirContext e
public NamingEnumeration<SearchResult> search( Name name, ExprNode filter, SearchControls cons )
throws NamingException
{
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
AliasDerefMode aliasDerefMode = AliasDerefMode.getEnum( getEnvironment() );
try
{
@@ -883,7 +883,7 @@ public abstract class ServerDirContext e
throws NamingException
{
ExprNode filterNode;
- DN target = buildTarget( DN.fromName( name ) );
+ DN target = buildTarget( JndiUtils.fromName( name ) );
try
{
@@ -1020,7 +1020,7 @@ public abstract class ServerDirContext e
criteria.setFilter( filter );
criteria.setScope( SearchScope.getSearchScope( searchControls.getSearchScope() ) );
criteria.setAliasDerefMode( AliasDerefMode.getEnum( getEnvironment() ) );
- criteria.setBase( buildTarget( DN.fromName( name ) ) );
+ criteria.setBase( buildTarget( JndiUtils.fromName( name ) ) );
getDirectoryService().getEventService().addListener( listener );
getListeners().put( namingListener, listener );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java Fri Aug 6 14:28:50 2010
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.jndi;
@@ -75,7 +75,7 @@ public class ServerLdapContext extends S
* @param principal the directory user principal that is propagated
* @param dn the distinguished name of this context
* @param service the directory service core
- * @throws NamingException if there are problems instantiating
+ * @throws NamingException if there are problems instantiating
*/
public ServerLdapContext( DirectoryService service, LdapPrincipal principal, Name dn ) throws Exception
{
@@ -106,16 +106,16 @@ public class ServerLdapContext extends S
public LdapContext newInstance( Control[] requestControls ) throws NamingException
{
ServerLdapContext ctx = null;
-
+
try
{
- ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), DN.toName( getDn() ) );
+ ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), JndiUtils.toName( getDn() ) );
}
catch ( Exception e )
{
JndiUtils.wrap( e );
}
-
+
ctx.setRequestControls( requestControls );
return ctx;
}
@@ -187,9 +187,9 @@ public class ServerLdapContext extends S
public boolean compare( DN name, String oid, Object value ) throws NamingException
{
Value<?> val = null;
-
+
AttributeType attributeType = null;
-
+
try
{
attributeType = getService().getSchemaManager().lookupAttributeTypeRegistry( oid );
@@ -198,7 +198,7 @@ public class ServerLdapContext extends S
{
throw new InvalidAttributeIdentifierException( le.getMessage() );
}
-
+
// make sure we add the request controls to operation
if ( attributeType.getSyntax().isHumanReadable() )
{
@@ -230,11 +230,11 @@ public class ServerLdapContext extends S
throw new NamingException( I18n.err( I18n.ERR_309, oid ) );
}
}
-
-
+
+
CompareOperationContext opCtx = new CompareOperationContext( getSession(), name, oid, val );
opCtx.addRequestControls( JndiUtils.fromJndiControls( requestControls ) );
-
+
// Inject the Referral flag
injectReferralControl( opCtx );
@@ -248,7 +248,7 @@ public class ServerLdapContext extends S
{
JndiUtils.wrap( e );
}
-
+
// extract the response controls from the operation and return
responseControls = getResponseControls();
requestControls = EMPTY_CONTROLS;
@@ -257,11 +257,11 @@ public class ServerLdapContext extends S
/**
- * Calling this method tunnels an unbind call down into the partition holding
+ * Calling this method tunnels an unbind call down into the partition holding
* the bindDn. The bind() counter part is not exposed because it is automatically
- * called when you create a new initial context for a new connection (on wire) or
+ * called when you create a new initial context for a new connection (on wire) or
* (programatic) caller.
- *
+ *
* @throws NamingException if there are failures encountered while unbinding
*/
public void ldapUnbind() throws NamingException
@@ -277,7 +277,7 @@ public class ServerLdapContext extends S
{
JndiUtils.wrap( e );
}
-
+
responseControls = JndiUtils.toJndiControls( opCtx.getResponseControls() );
requestControls = EMPTY_CONTROLS;
}
@@ -286,7 +286,7 @@ public class ServerLdapContext extends S
public ServerContext getRootContext() throws NamingException
{
ServerContext ctx = null;
-
+
try
{
ctx = new ServerLdapContext( getService(), getSession().getEffectivePrincipal(), new LdapName( "" ) );
@@ -295,7 +295,7 @@ public class ServerLdapContext extends S
{
JndiUtils.wrap( e );
}
-
+
return ctx;
}
}
Propchange: directory/apacheds/branches/apacheds-codec-merge/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
-/directory/apacheds/trunk/http-integration:980025-980137
+/directory/apacheds/trunk/http-integration:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
-/directory/apacheds/trunk/i18n:980025-980137
+/directory/apacheds/trunk/i18n:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
+/directory/apacheds/trunk/interceptor-kerberos:982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
-/directory/apacheds/trunk/jdbm:980025-980137
+/directory/apacheds/trunk/jdbm:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
-/directory/apacheds/trunk/jdbm-partition:980025-980137
+/directory/apacheds/trunk/jdbm-partition:980025-980137,982368-982970
Modified: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=982989&r1=982988&r2=982989&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Fri Aug 6 14:28:50 2010
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.partition.impl.btree.jdbm;
@@ -87,7 +87,7 @@ public class JdbmStoreTest
private static SchemaManager schemaManager = null;
private static LdifSchemaLoader loader;
private static DN EXAMPLE_COM;
-
+
/** The OU AttributeType instance */
private static AttributeType OU_AT;
@@ -127,7 +127,7 @@ public class JdbmStoreTest
}
EXAMPLE_COM = new DN( "dc=example,dc=com", schemaManager );
-
+
OU_AT = schemaManager.getAttributeType( SchemaConstants.OU_AT );
DC_AT = schemaManager.getAttributeType( SchemaConstants.DC_AT );
SN_AT = schemaManager.getAttributeType( SchemaConstants.SN_AT );
@@ -216,7 +216,7 @@ public class JdbmStoreTest
// lookup the context entry
Long id = store2.getEntryId( suffixDn );
Entry lookup = store2.lookup( id );
- assertEquals( 2, lookup.getDn().getRdns().size() );
+ assertEquals( 2, lookup.getDn().size() );
}
@@ -400,7 +400,7 @@ public class JdbmStoreTest
assertFalse( systemIndices.hasNext() );
assertNotNull( store.getSystemIndex( APACHE_ALIAS_AT ) );
-
+
try
{
store.getSystemIndex( "bogus" );
@@ -574,7 +574,7 @@ public class JdbmStoreTest
assertEquals( 12, ( long ) cursor.get().getId() );
DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co.", schemaManager );
-
+
DN newDn = newParentDn.add( martinDn.getRdn() );
store.move( martinDn, newParentDn, newDn, entry );
@@ -641,7 +641,7 @@ public class JdbmStoreTest
// so this gets cleaned up automatically
File testSpecificDir = new File( wkdir, "testConvertIndex" );
testSpecificDir.mkdirs();
-
+
Index nonJdbmIndex = new GenericIndex( "ou", 10, testSpecificDir );
Method convertIndex = store.getClass().getDeclaredMethod( "convertAndInit", Index.class );
@@ -756,7 +756,7 @@ public class JdbmStoreTest
store.moveAndRename( childDn, parentDn, rdn, childEntry, true );
- // to drop the alias indices
+ // to drop the alias indices
childDn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co.", schemaManager );
parentDn = new DN( "ou=Engineering,o=Good Times Co.", schemaManager );
@@ -764,7 +764,7 @@ public class JdbmStoreTest
assertEquals( 3, store.getSubAliasIndex().count() );
DN newDn = parentDn.add( childDn.getRdn() );
-
+
store.move( childDn, parentDn, newDn, childEntry );
assertEquals( 4, store.getSubAliasIndex().count() );
@@ -891,8 +891,8 @@ public class JdbmStoreTest
store.modify( dn, mods );
assertEquals( attribVal, lookedup.get( "ou" ).get().getString() );
}
-
-
+
+
@Test
public void testDeleteUnusedIndexFiles() throws Exception
{
@@ -900,22 +900,22 @@ public class JdbmStoreTest
File ouIndexTxtFile = new File( wkdir, SchemaConstants.OU_AT_OID + "-ou.txt" );
File uuidIndexDbFile = new File( wkdir, SchemaConstants.ENTRY_UUID_AT_OID + ".db" );
File uuidIndexTxtFile = new File( wkdir, SchemaConstants.ENTRY_UUID_AT_OID + "-entryUUID.txt" );
-
+
assertTrue( ouIndexDbFile.exists() );
assertTrue( ouIndexTxtFile.exists() );
assertTrue( uuidIndexDbFile.exists() );
assertTrue( uuidIndexTxtFile.exists() );
-
+
// destroy the store to manually start the init phase
// by keeping the same work dir
store.destroy();
-
+
// just assert again that ou and entryUUID files exist even after destroying the store
assertTrue( ouIndexDbFile.exists() );
assertTrue( ouIndexTxtFile.exists() );
assertTrue( uuidIndexDbFile.exists() );
assertTrue( uuidIndexTxtFile.exists() );
-
+
store = new JdbmStore<Entry>();
store.setId( "example" );
store.setCacheSize( 10 );
@@ -924,7 +924,7 @@ public class JdbmStoreTest
// do not add ou index this time
store.addIndex( new JdbmIndex( SchemaConstants.UID_AT_OID ) );
-
+
DN suffixDn = new DN( "o=Good Times Co.", schemaManager );
store.setSuffixDn( suffixDn );
// init the store to call deleteUnusedIndexFiles() method
@@ -936,5 +936,5 @@ public class JdbmStoreTest
assertTrue( uuidIndexDbFile.exists() );
assertTrue( uuidIndexTxtFile.exists() );
}
-
+
}
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,980025-980137
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,5 +1,6 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:980138-980935
/directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:749790-764110
+/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:809853-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,980025-980137
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,980025-980137
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,980025-980137
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared:980138-980936
-/directory/apacheds/trunk/kerberos-shared:980025-980137
+/directory/apacheds/trunk/kerberos-shared:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
-/directory/apacheds/trunk/kerberos-test:980025-980137
+/directory/apacheds/trunk/kerberos-test:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -0,0 +1,5 @@
+/directory/apacheds/branches/apacheds-replication/ldap-client-test:749790-764110
+/directory/apacheds/branches/apacheds-schema/ldap-client-test:806623-896441
+/directory/apacheds/branches/apacheds-subtree/ldap-client-test:965203-965686
+/directory/apacheds/branches/xdbm-refactoring/ldap-client-test:945827-946347
+/directory/apacheds/trunk/ldap-client-test:982368-982965
Propchange: directory/apacheds/branches/apacheds-codec-merge/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
-/directory/apacheds/trunk/ldif-partition:980025-980137
+/directory/apacheds/trunk/ldif-partition:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
-/directory/apacheds/trunk/protocol-changepw:980025-980137
+/directory/apacheds/trunk/protocol-changepw:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
-/directory/apacheds/trunk/protocol-dhcp:980025-980137
+/directory/apacheds/trunk/protocol-dhcp:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
-/directory/apacheds/trunk/protocol-dns:980025-980137
+/directory/apacheds/trunk/protocol-dns:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
-/directory/apacheds/trunk/protocol-kerberos:980025-980137
+/directory/apacheds/trunk/protocol-kerberos:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
-/directory/apacheds/trunk/protocol-ldap:980025-980137
+/directory/apacheds/trunk/protocol-ldap:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
/directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:980025-980137
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
+/directory/apacheds/trunk/protocol-ntp:982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
-/directory/apacheds/trunk/protocol-shared:980025-980137
+/directory/apacheds/trunk/protocol-shared:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
-/directory/apacheds/trunk/server-annotations:980025-980137
+/directory/apacheds/trunk/server-annotations:980025-980137,982368-982970
Propchange: directory/apacheds/branches/apacheds-codec-merge/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
+/directory/apacheds/trunk/server-integ:982368-982971
Propchange: directory/apacheds/branches/apacheds-codec-merge/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
-/directory/apacheds/trunk/server-jndi:980025-980137
+/directory/apacheds/trunk/server-jndi:980025-980137,982368-982971
Propchange: directory/apacheds/branches/apacheds-codec-merge/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
-/directory/apacheds/trunk/server-replication:980025-980137
+/directory/apacheds/trunk/server-replication:980025-980137,982368-982971
Propchange: directory/apacheds/branches/apacheds-codec-merge/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
-/directory/apacheds/trunk/server-tools:980025-980137
+/directory/apacheds/trunk/server-tools:980025-980137,982368-982972
Propchange: directory/apacheds/branches/apacheds-codec-merge/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -4,4 +4,4 @@
/directory/apacheds/branches/apacheds-schema/test-framework:806623-896441
/directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:980025-980137
+/directory/apacheds/trunk/test-framework:980025-980137,982368-982973
Propchange: directory/apacheds/branches/apacheds-codec-merge/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
-/directory/apacheds/trunk/xdbm-partition:980025-980137
+/directory/apacheds/trunk/xdbm-partition:980025-980137,982368-982973
Propchange: directory/apacheds/branches/apacheds-codec-merge/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 6 14:28:50 2010
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
-/directory/apacheds/trunk/xdbm-tools:980025-980137
+/directory/apacheds/trunk/xdbm-tools:980025-980137,982368-982973
|