You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2009/08/31 19:49:06 UTC
svn commit: r809674 [2/2] - in /directory/apacheds/branches/apacheds-schema:
core-entry/src/main/java/org/apache/directory/server/core/entry/
core-integ/src/main/java/org/apache/directory/server/core/integ/
core-integ/src/test/java/org/apache/directory...
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Mon Aug 31 17:49:02 2009
@@ -35,6 +35,7 @@
import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer;
import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
+import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
/**
@@ -51,6 +52,7 @@
public DummyAttributeTypeRegistry(boolean returnOperational)
{
+ super( new OidRegistry() );
this.returnOperational = returnOperational;
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Mon Aug 31 17:49:02 2009
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.normalization;
+
import java.text.ParseException;
import org.apache.directory.server.core.DefaultDirectoryService;
@@ -30,7 +31,6 @@
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -57,9 +57,8 @@
{
service = new DefaultDirectoryService();
- OidRegistry oidRegistry = service.getRegistries().getOidRegistry();
AttributeTypeRegistry attributeRegistry = service.getRegistries().getAttributeTypeRegistry();
- NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
+ NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry );
normVisitor = new FilterNormalizingVisitor( ncn, service.getRegistries() );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java Mon Aug 31 17:49:02 2009
@@ -20,23 +20,16 @@
package org.apache.directory.server.core.schema;
+import org.apache.commons.lang.NotImplementedException;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.entry.DefaultServerAttributeTest;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.server.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
-import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
import org.apache.directory.shared.ldap.schema.comparators.SerializableComparator;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.bootstrap.partition.SchemaPartitionExtractor;
-import org.apache.directory.server.schema.registries.DefaultRegistries;
import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,8 +40,6 @@
import javax.naming.NamingException;
import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -86,18 +77,19 @@
// Load the bootstrap schemas to start up the schema partition
// --------------------------------------------------------------------
- // setup temporary loader and temp registry
- BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
- registries = new DefaultRegistries( "bootstrap", loader, new OidRegistry() );
- directoryService.setRegistries( registries );
-
- // load essential bootstrap schemas
- Set<Schema> bootstrapSchemas = new HashSet<Schema>();
- bootstrapSchemas.add( new ApachemetaSchema() );
- bootstrapSchemas.add( new ApacheSchema() );
- bootstrapSchemas.add( new CoreSchema() );
- bootstrapSchemas.add( new SystemSchema() );
- loader.loadWithDependencies( bootstrapSchemas, registries );
+ if ( workingDirectory == null )
+ {
+ String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ int targetPos = path.indexOf( "target" );
+ workingDirectory = new File( path.substring( 0, targetPos + 6 ) );
+ }
+
+ File schemaRepository = new File( workingDirectory, "schema" );
+ SchemaLdifExtractor extractor = new SchemaLdifExtractor( workingDirectory );
+ extractor.extractOrCopy();
+ LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+ registries = new Registries();
+ loader.loadAllEnabled( registries );
// run referential integrity tests
List<Throwable> errors = registries.checkRefInteg();
@@ -112,39 +104,10 @@
SerializableComparator.setRegistry( registries.getComparatorRegistry() );
// --------------------------------------------------------------------
- // If not present extract schema partition from jar
+ // TODO add code here to start up the LDIF schema partition
// --------------------------------------------------------------------
- SchemaPartitionExtractor extractor = null;
- try
- {
- extractor = new SchemaPartitionExtractor( directoryService.getWorkingDirectory() );
- extractor.extract();
- }
- catch ( IOException e )
- {
- NamingException ne = new NamingException( "Failed to extract pre-loaded schema partition." );
- ne.setRootCause( e );
- throw ne;
- }
-
- // --------------------------------------------------------------------
- // Initialize schema partition
- // --------------------------------------------------------------------
-
- schemaPartition = new JdbmPartition();
- schemaPartition.setId( "schema" );
- schemaPartition.setCacheSize( 1000 );
-
- Set<Index<?, ServerEntry>> indexedAttributes = new HashSet<Index<?, ServerEntry>>();
- for ( String attributeId : extractor.getDbFileListing().getIndexedAttributes() )
- {
- indexedAttributes.add( new JdbmIndex<String,ServerEntry>( attributeId ) );
- }
-
- schemaPartition.setIndexedAttributes( indexedAttributes );
- schemaPartition.setSuffix( "ou=schema" );
- schemaPartition.init( directoryService );
+ throw new NotImplementedException();
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Mon Aug 31 17:49:02 2009
@@ -20,19 +20,18 @@
package org.apache.directory.server.core.schema;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import javax.naming.NamingException;
import org.apache.directory.server.core.entry.DefaultServerAttribute;
+import org.apache.directory.server.core.entry.DefaultServerAttributeTest;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.entry.ServerAttribute;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.schema.SchemaChecker;
-import org.apache.directory.server.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
-import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.DefaultRegistries;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
@@ -44,15 +43,15 @@
import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.schema.registries.Registries;
import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.io.File;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
/**
@@ -69,14 +68,21 @@
@BeforeClass
protected void setUp() throws Exception
{
- BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
- registries = new DefaultRegistries( "bootstrap", loader, new OidRegistry() );
+ String workingDirectory = System.getProperty( "workingDirectory" );
+
+ if ( workingDirectory == null )
+ {
+ String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ int targetPos = path.indexOf( "target" );
+ workingDirectory = path.substring( 0, targetPos + 6 );
+ }
- Set<Schema> schemas = new HashSet<Schema>();
- schemas.add( new SystemSchema() );
- schemas.add( new ApacheSchema() );
- schemas.add( new CoreSchema() );
- loader.loadWithDependencies( schemas,registries );
+ File schemaRepository = new File( workingDirectory, "schema" );
+ SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) );
+ extractor.extractOrCopy();
+ LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+ registries = new Registries();
+ loader.loadAllEnabled( registries );
List<Throwable> errors = registries.checkRefInteg();
@@ -475,7 +481,6 @@
@Test
public void testPreventRdnChangeOnModifyRemoveAttribute() throws Exception
{
- OidRegistry registry = new MockOidRegistry();
ModificationOperation mod = ModificationOperation.REMOVE_ATTRIBUTE;
LdapDN name = new LdapDN( "ou=user,dc=example,dc=com" );
AttributeType cnAt = registries.getAttributeTypeRegistry().lookup( "cn" );
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Mon Aug 31 17:49:02 2009
@@ -20,20 +20,17 @@
package org.apache.directory.server.core.schema;
+import java.io.File;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.directory.server.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
-import org.apache.directory.server.schema.bootstrap.CosineSchema;
-import org.apache.directory.server.schema.bootstrap.NisSchema;
-import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.DefaultRegistries;
+import org.apache.directory.server.core.entry.DefaultServerAttributeTest;
import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
+import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -45,19 +42,28 @@
*/
public class SchemaServiceTest
{
- private static DefaultRegistries registries;
+ private static Registries registries;
@Before
public void setUp() throws Exception
{
- BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
- registries = new DefaultRegistries( "bootstrap", loader, new OidRegistry() );
- loader.load( new SystemSchema(), registries, false );
- loader.load( new ApacheSchema(), registries, false );
- loader.load( new CoreSchema(), registries, false );
- loader.load( new CosineSchema(), registries, false );
- loader.load( new NisSchema(), registries, false );
+ String workingDirectory = System.getProperty( "workingDirectory" );
+
+ if ( workingDirectory == null )
+ {
+ String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ int targetPos = path.indexOf( "target" );
+ workingDirectory = path.substring( 0, targetPos + 6 );
+ }
+
+ File schemaRepository = new File( workingDirectory, "schema" );
+ SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) );
+ extractor.extractOrCopy();
+ LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+ registries = new Registries();
+ loader.loadAllEnabled( registries );
+ loader.loadWithDependencies( loader.getSchema( "nis" ), registries );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Mon Aug 31 17:49:02 2009
@@ -17,32 +17,23 @@
* under the License.
*
*/
-
package org.apache.directory.server.core.security;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
import java.security.KeyPair;
import java.security.cert.X509Certificate;
-import java.util.HashSet;
-import java.util.Set;
+import org.apache.directory.server.core.entry.DefaultServerAttributeTest;
import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.schema.bootstrap.ApachemetaSchema;
-import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
-import org.apache.directory.server.schema.bootstrap.CosineSchema;
-import org.apache.directory.server.schema.bootstrap.InetorgpersonSchema;
-import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.DefaultRegistries;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.schema.registries.Registries;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
@@ -58,9 +49,8 @@
public class TlsKeyGeneratorTest
{
private static final Logger LOG = LoggerFactory.getLogger( TlsKeyGeneratorTest.class );
- private static BootstrapSchemaLoader loader;
+ private static LdifSchemaLoader loader;
private static Registries registries;
- private static OidRegistry oidRegistry;
/**
@@ -69,20 +59,21 @@
@BeforeClass
public static void setup() throws Exception
{
- loader = new BootstrapSchemaLoader();
- oidRegistry = new OidRegistry();
- registries = new DefaultRegistries( "bootstrap", loader, oidRegistry );
-
- // load essential bootstrap schemas
- Set<Schema> bootstrapSchemas = new HashSet<Schema>();
- bootstrapSchemas.add( new ApachemetaSchema() );
- bootstrapSchemas.add( new ApacheSchema() );
- bootstrapSchemas.add( new CoreSchema() );
- bootstrapSchemas.add( new SystemSchema() );
- bootstrapSchemas.add( new InetorgpersonSchema() );
- bootstrapSchemas.add( new CosineSchema() );
- loader.loadWithDependencies( bootstrapSchemas, registries );
-
+ String workingDirectory = System.getProperty( "workingDirectory" );
+
+ if ( workingDirectory == null )
+ {
+ String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ int targetPos = path.indexOf( "target" );
+ workingDirectory = path.substring( 0, targetPos + 6 );
+ }
+
+ File schemaRepository = new File( workingDirectory, "schema" );
+ SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) );
+ extractor.extractOrCopy();
+ loader = new LdifSchemaLoader( schemaRepository );
+ registries = new Registries();
+ loader.loadAllEnabled( registries );
}
Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=809674&r1=809673&r2=809674&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Mon Aug 31 17:49:02 2009
@@ -20,28 +20,25 @@
package org.apache.directory.server.core.subtree;
+import java.io.File;
import java.util.HashSet;
import java.util.Set;
+import org.apache.directory.server.core.entry.DefaultServerAttributeTest;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
-import org.apache.directory.server.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
import org.apache.directory.shared.ldap.schema.normalizers.ConcreteNameComponentNormalizer;
-import org.apache.directory.shared.ldap.schema.registries.Schema;
-import org.apache.directory.server.schema.bootstrap.SystemSchema;
-import org.apache.directory.server.schema.registries.DefaultRegistries;
import org.apache.directory.shared.ldap.filter.ExprNode;
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.NameComponentNormalizer;
import org.apache.directory.shared.ldap.schema.registries.AttributeTypeRegistry;
-import org.apache.directory.shared.ldap.schema.registries.OidRegistry;
import org.apache.directory.shared.ldap.schema.registries.Registries;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationModifier;
+import org.apache.directory.shared.schema.loader.ldif.LdifSchemaLoader;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -66,18 +63,25 @@
private void init() throws Exception
{
- BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
- OidRegistry oidRegistry = new OidRegistry();
- DefaultRegistries bsRegistries = new DefaultRegistries( "bootstrap", loader, oidRegistry );
- registries = bsRegistries;
- Set<Schema> schemas = new HashSet<Schema>();
- schemas.add( new SystemSchema() );
- schemas.add( new ApacheSchema() );
- schemas.add( new CoreSchema() );
- loader.loadWithDependencies( schemas, bsRegistries );
+ String workingDirectory = System.getProperty( "workingDirectory" );
+
+ if ( workingDirectory == null )
+ {
+ String path = DefaultServerAttributeTest.class.getResource( "" ).getPath();
+ int targetPos = path.indexOf( "target" );
+ workingDirectory = path.substring( 0, targetPos + 6 );
+ }
+
+ File schemaRepository = new File( workingDirectory, "schema" );
+ SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) );
+ extractor.extractOrCopy();
+ LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+ registries = new Registries();
+ loader.loadAllEnabled( registries );
+
attributeRegistry = registries.getAttributeTypeRegistry();
- NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
+ NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry );
visitor = new FilterNormalizingVisitor( ncn, registries );
}