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 2006/12/11 20:04:58 UTC
svn commit: r485822 - in /directory/branches/trunks/schema/apacheds:
bootstrap-schema/
bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/
bootstrap-schema/src/main/schema/ core/
core/src/main/java/org/apache/directory/ser...
Author: akarasulu
Date: Mon Dec 11 11:04:56 2006
New Revision: 485822
URL: http://svn.apache.org/viewvc?view=rev&rev=485822
Log:
moving lots of things around
Added:
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
- copied unchanged from r485787, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
directory/branches/trunks/schema/apacheds/core/src/main/schema/
directory/branches/trunks/schema/apacheds/core/src/main/schema/apache.schema
- copied unchanged from r485789, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/apache.schema
directory/branches/trunks/schema/apacheds/core/src/main/schema/core.schema
- copied unchanged from r485789, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/core.schema
directory/branches/trunks/schema/apacheds/core/src/main/schema/system.schema
- copied unchanged from r485789, directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/system.schema
Removed:
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/AbstractBootstrapProducer.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapAttributeTypeRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapComparatorRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitContentRuleRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapDitStructureRuleRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapMatchingRuleUseRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNameFormRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapNormalizerRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectClassRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapObjectFactoryRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapOidRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapProducer.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapRegistries.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSchemaLoader.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapStateFactoryRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxCheckerRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/BootstrapSyntaxRegistry.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/java/org/apache/directory/server/core/schema/bootstrap/ProducerCallback.java
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/apache.schema
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/core.schema
directory/branches/trunks/schema/apacheds/bootstrap-schema/src/main/schema/system.schema
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/global/
Modified:
directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml
directory/branches/trunks/schema/apacheds/core/pom.xml
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
Modified: directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-schema/pom.xml Mon Dec 11 11:04:56 2006
@@ -16,6 +16,11 @@
schemas to populate the schema partition.
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
<version>${pom.version}</version>
Modified: directory/branches/trunks/schema/apacheds/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/pom.xml?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/pom.xml (original)
+++ directory/branches/trunks/schema/apacheds/core/pom.xml Mon Dec 11 11:04:56 2006
@@ -36,134 +36,6 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-plugin</artifactId>
- <configuration>
- <schemaSourcesDir>src/main/schema</schemaSourcesDir>
- <schemas>
- <schema>
- <name>apache</name>
- <dependencies>
- <dependency>system</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>apachemeta</name>
- <dependencies>
- <dependency>system</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>apachedns</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>autofs</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- <dependency>cosine</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>collective</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>corba</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>core</name>
- <dependencies>
- <dependency>system</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>cosine</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>inetorgperson</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- <dependency>cosine</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>java</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>krb5kdc</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>nis</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- <dependency>cosine</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>system</name>
- </schema>
- <schema>
- <name>mozilla</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>dhcp</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- </dependencies>
- </schema>
- <schema>
- <name>samba</name>
- <dependencies>
- <dependency>system</dependency>
- <dependency>core</dependency>
- <dependency>inetorgperson</dependency>
- <dependency>nis</dependency>
- </dependencies>
- </schema>
- </schemas>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Mon Dec 11 11:04:56 2006
@@ -43,9 +43,7 @@
import org.apache.directory.server.core.partition.DefaultPartitionNexus;
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.schema.AttributeTypeRegistry;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapRegistries;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchemaLoader;
-import org.apache.directory.server.core.schema.global.GlobalRegistries;
+import org.apache.directory.server.core.schema.Registries;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
@@ -85,7 +83,7 @@
private StartupConfiguration startupConfiguration;
/** the registries for system schema objects */
- private GlobalRegistries globalRegistries;
+ private Registries registries;
/** the root nexus */
private DefaultPartitionNexus partitionNexus;
@@ -315,9 +313,9 @@
}
- public GlobalRegistries getGlobalRegistries()
+ public Registries getRegistries()
{
- return globalRegistries;
+ return registries;
}
@@ -459,7 +457,7 @@
// create system users area
// -------------------------------------------------------------------
- Map oidsMap = configuration.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping();
+ Map oidsMap = configuration.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
LdapDN userDn = new LdapDN( "ou=users,ou=system" );
userDn.normalize( oidsMap );
@@ -665,7 +663,7 @@
boolean needToChangeAdminPassword = false;
LdapDN adminDn = new LdapDN( PartitionNexus.ADMIN_PRINCIPAL );
- adminDn.normalize( configuration.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
+ adminDn.normalize( configuration.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
Attributes adminEntry = partitionNexus.lookup( adminDn );
Object userPassword = adminEntry.get( "userPassword" ).get();
@@ -738,22 +736,28 @@
// --------------------------------------------------------------------
// Load the schema here and check that it is ok!
// --------------------------------------------------------------------
-
- BootstrapRegistries bootstrapRegistries = new BootstrapRegistries();
- BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
- loader.load( startupConfiguration.getBootstrapSchemas(), bootstrapRegistries );
-
- java.util.List errors = bootstrapRegistries.checkRefInteg();
- if ( !errors.isEmpty() )
+
+ // @TODO need to seriously rewrite this section here
+
+ if ( true )
{
- NamingException e = new NamingException();
-
- e.setRootCause( ( Throwable ) errors.get( 0 ) );
-
- throw e;
+ throw new RuntimeException( "rewrite this schema initialization code" );
}
-
- globalRegistries = new GlobalRegistries( bootstrapRegistries );
+// BootstrapRegistries bootstrapRegistries = new BootstrapRegistries();
+// BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
+// loader.load( startupConfiguration.getBootstrapSchemas(), bootstrapRegistries );
+//
+// java.util.List errors = bootstrapRegistries.checkRefInteg();
+// if ( !errors.isEmpty() )
+// {
+// NamingException e = new NamingException();
+//
+// e.setRootCause( ( Throwable ) errors.get( 0 ) );
+//
+// throw e;
+// }
+//
+// globalRegistries = new GlobalRegistries( bootstrapRegistries );
Set<String> binaries = new HashSet<String>();
if ( this.environment.containsKey( BINARY_KEY ) )
{
@@ -792,7 +796,7 @@
}
// now get all the attributeTypes that are binary from the registry
- AttributeTypeRegistry registry = globalRegistries.getAttributeTypeRegistry();
+ AttributeTypeRegistry registry = registries.getAttributeTypeRegistry();
Iterator list = registry.list();
while ( list.hasNext() )
{
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryServiceConfiguration.java Mon Dec 11 11:04:56 2006
@@ -28,7 +28,7 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.global.GlobalRegistries;
+import org.apache.directory.server.core.schema.Registries;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -79,9 +79,9 @@
}
- public GlobalRegistries getGlobalRegistries()
+ public Registries getRegistries()
{
- return parent.getGlobalRegistries();
+ return parent.getRegistries();
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/DirectoryServiceConfiguration.java Mon Dec 11 11:04:56 2006
@@ -27,7 +27,7 @@
import org.apache.directory.server.core.configuration.StartupConfiguration;
import org.apache.directory.server.core.interceptor.InterceptorChain;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.global.GlobalRegistries;
+import org.apache.directory.server.core.schema.Registries;
/**
@@ -72,7 +72,7 @@
/**
* Returns the registries for system schema objects of the {@link DirectoryService}.
*/
- GlobalRegistries getGlobalRegistries();
+ Registries getRegistries();
/**
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java Mon Dec 11 11:04:56 2006
@@ -166,8 +166,8 @@
super.init( factoryCfg, cfg );
tupleCache = new TupleCache( factoryCfg );
groupCache = new GroupCache( factoryCfg );
- attrRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
- OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
+ attrRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
+ OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
// look up some constant information
objectClassOid = oidRegistry.getOid( "objectClass" );
@@ -177,7 +177,7 @@
acSubentryType = attrRegistry.lookup( acSubentryOid );
aciParser = new ACIItemParser( new ConcreteNameComponentNormalizer( attrRegistry, oidRegistry ), attrRegistry.getNormalizerMapping() );
- engine = new ACDFEngine( factoryCfg.getGlobalRegistries().getOidRegistry(), attrRegistry );
+ engine = new ACDFEngine( factoryCfg.getRegistries().getOidRegistry(), attrRegistry );
chain = factoryCfg.getInterceptorChain();
enabled = factoryCfg.getStartupConfiguration().isAccessControlEnabled();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/DefaultAuthorizationService.java Mon Dec 11 11:04:56 2006
@@ -102,7 +102,7 @@
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
nexus = factoryCfg.getPartitionNexus();
- normalizerMapping = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping();
+ normalizerMapping = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
// disable this static module if basic access control mechanisms are enabled
enabled = !factoryCfg.getStartupConfiguration().isAccessControlEnabled();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Mon Dec 11 11:04:56 2006
@@ -81,7 +81,7 @@
*/
public GroupCache( DirectoryServiceConfiguration factoryCfg ) throws NamingException
{
- normalizerMap = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping();
+ normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
this.nexus = factoryCfg.getPartitionNexus();
this.env = ( Hashtable ) factoryCfg.getEnvironment().clone();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Mon Dec 11 11:04:56 2006
@@ -90,10 +90,10 @@
*/
public TupleCache(DirectoryServiceConfiguration factoryCfg) throws NamingException
{
- normalizerMap = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping();
+ normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
this.nexus = factoryCfg.getPartitionNexus();
- AttributeTypeRegistry attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
- OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
+ AttributeTypeRegistry attributeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
+ OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
aciParser = new ACIItemParser( ncn, normalizerMap );
env = ( Hashtable ) factoryCfg.getEnvironment().clone();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeService.java Mon Dec 11 11:04:56 2006
@@ -81,7 +81,7 @@
{
super.init( factoryCfg, cfg );
nexus = factoryCfg.getPartitionNexus();
- registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ registry = factoryCfg.getRegistries().getAttributeTypeRegistry();
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/MutableStartupConfiguration.java Mon Dec 11 11:04:56 2006
@@ -92,12 +92,6 @@
}
- public void setBootstrapSchemas( Set bootstrapSchemas )
- {
- super.setBootstrapSchemas( bootstrapSchemas );
- }
-
-
public void setContextPartitionConfigurations( Set contextParitionConfigurations )
{
super.setContextPartitionConfigurations( contextParitionConfigurations );
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/configuration/StartupConfiguration.java Mon Dec 11 11:04:56 2006
@@ -42,14 +42,6 @@
import org.apache.directory.server.core.operational.OperationalAttributeService;
import org.apache.directory.server.core.referral.ReferralService;
import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.server.core.schema.bootstrap.ApacheSchema;
-import org.apache.directory.server.core.schema.bootstrap.BootstrapSchema;
-import org.apache.directory.server.core.schema.bootstrap.CollectiveSchema;
-import org.apache.directory.server.core.schema.bootstrap.CoreSchema;
-import org.apache.directory.server.core.schema.bootstrap.CosineSchema;
-import org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema;
-import org.apache.directory.server.core.schema.bootstrap.JavaSchema;
-import org.apache.directory.server.core.schema.bootstrap.SystemSchema;
import org.apache.directory.server.core.subtree.SubentryService;
import org.apache.directory.server.core.trigger.TriggerService;
import org.apache.directory.shared.ldap.ldif.Entry;
@@ -92,7 +84,6 @@
public StartupConfiguration()
{
setDefaultAuthenticatorConfigurations();
- setDefaultBootstrapSchemas();
setDefaultInterceptorConfigurations();
}
@@ -104,7 +95,6 @@
public StartupConfiguration(String instanceId)
{
setDefaultAuthenticatorConfigurations();
- setDefaultBootstrapSchemas();
setDefaultInterceptorConfigurations();
setInstanceId( instanceId );
}
@@ -135,24 +125,6 @@
}
- private void setDefaultBootstrapSchemas()
- {
- Set set;
- // Set default bootstrap schemas
- set = new HashSet();
-
- set.add( new CoreSchema() );
- set.add( new CosineSchema() );
- set.add( new ApacheSchema() );
- set.add( new InetorgpersonSchema() );
- set.add( new JavaSchema() );
- set.add( new SystemSchema() );
- set.add( new CollectiveSchema() );
-
- setBootstrapSchemas( set );
- }
-
-
private void setDefaultInterceptorConfigurations()
{
// Set default interceptor chains
@@ -255,24 +227,6 @@
}
this.authenticatorConfigurations = newSet;
- }
-
-
- /**
- * Returns {@link BootstrapSchema}s to load while bootstrapping.
- */
- public Set getBootstrapSchemas()
- {
- return ConfigurationUtil.getClonedSet( bootstrapSchemas );
- }
-
-
- /**
- * Sets {@link BootstrapSchema}s to load while bootstrapping.
- */
- protected void setBootstrapSchemas( Set bootstrapSchemas )
- {
- this.bootstrapSchemas = ConfigurationUtil.getTypeSafeSet( bootstrapSchemas, BootstrapSchema.class );
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java Mon Dec 11 11:04:56 2006
@@ -76,12 +76,12 @@
{
super.init( factoryCfg, cfg );
- OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
- attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
+ attributeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
evaluator = new ExpressionEvaluator( oidRegistry, attributeRegistry );
nexus = factoryCfg.getPartitionNexus();
NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
- visitor = new NormalizingVisitor( ncn, factoryCfg.getGlobalRegistries().getOidRegistry() );
+ visitor = new NormalizingVisitor( ncn, factoryCfg.getRegistries().getOidRegistry() );
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Mon Dec 11 11:04:56 2006
@@ -71,7 +71,7 @@
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
nexus = factoryCfg.getPartitionNexus();
- normalizerMap = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping();
+ normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
Attribute attr = nexus.getRootDSE().get( "subschemaSubentry" );
subschemSubentryDn = new LdapDN( ( String ) attr.get() );
subschemSubentryDn.normalize( normalizerMap );
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/normalization/NormalizationService.java Mon Dec 11 11:04:56 2006
@@ -79,8 +79,8 @@
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
- OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
- attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ OidRegistry oidRegistry = factoryCfg.getRegistries().getOidRegistry();
+ attributeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( attributeRegistry, oidRegistry );
normVisitor = new NormalizingVisitor( ncn, oidRegistry );
expVisitor = new ExpandingVisitor( attributeRegistry );
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java Mon Dec 11 11:04:56 2006
@@ -120,7 +120,7 @@
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
nexus = factoryCfg.getPartitionNexus();
- registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ registry = factoryCfg.getRegistries().getAttributeTypeRegistry();
isDenormalizeOpAttrsEnabled = factoryCfg.getStartupConfiguration().isDenormalizeOpAttrsEnabled();
}
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java Mon Dec 11 11:04:56 2006
@@ -170,7 +170,7 @@
if ( suffixDn == null )
{
suffixDn = new LdapDN( cfg.getSuffix() );
- suffixDn.normalize( factoryCfg.getGlobalRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
+ suffixDn.normalize( factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping() );
}
return suffixDn;
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Mon Dec 11 11:04:56 2006
@@ -193,8 +193,8 @@
}
this.factoryCfg = factoryCfg;
- this.attrRegistry = this.factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
- this.oidRegistry = this.factoryCfg.getGlobalRegistries().getOidRegistry();
+ this.attrRegistry = this.factoryCfg.getRegistries().getAttributeTypeRegistry();
+ this.oidRegistry = this.factoryCfg.getRegistries().getOidRegistry();
List<PartitionConfiguration> initializedPartitionCfgs = new ArrayList<PartitionConfiguration>();
initializedPartitionCfgs.add( initializeSystemPartition() );
@@ -280,7 +280,7 @@
// add all attribute oids of index configs to a hashset
Set<String> indices = systemCfg.getIndexedAttributes();
Set<String> indexOids = new HashSet<String>();
- OidRegistry registry = factoryCfg.getGlobalRegistries().getOidRegistry();
+ OidRegistry registry = factoryCfg.getRegistries().getOidRegistry();
for ( Iterator ii = indices.iterator(); ii.hasNext(); /**/ )
{
indexOids.add( registry.getOid( ii.next().toString() ) );
@@ -454,7 +454,7 @@
public boolean compare( LdapDN name, String oid, Object value ) throws NamingException
{
Partition partition = getBackend( name );
- AttributeTypeRegistry registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ AttributeTypeRegistry registry = factoryCfg.getRegistries().getAttributeTypeRegistry();
// complain if we do not recognize the attribute being compared
if ( !registry.hasAttributeType( oid ) )
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Mon Dec 11 11:04:56 2006
@@ -114,7 +114,7 @@
}
// Call this ONLY after trying to override the optimizer default above
- setRegistries( factoryCfg.getGlobalRegistries() );
+ setRegistries( factoryCfg.getRegistries() );
Set<String> sysOidSet = new HashSet<String>();
sysOidSet.add( Oid.EXISTANCE );
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Mon Dec 11 11:04:56 2006
@@ -140,8 +140,8 @@
btpConfig = MutableBTreePartitionConfiguration.getConfiguration( cfg );
}
- oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
- attributeTypeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ oidRegistry = factoryCfg.getRegistries().getOidRegistry();
+ attributeTypeRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
OBJECT_CLASS_AT = attributeTypeRegistry.lookup( "objectClass" );
ALIAS_AT = attributeTypeRegistry.lookup( Partition.ALIAS_ATTRIBUTE );
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/referral/ReferralService.java Mon Dec 11 11:04:56 2006
@@ -165,8 +165,8 @@
public void init( DirectoryServiceConfiguration dsConfig, InterceptorConfiguration cfg ) throws NamingException
{
nexus = dsConfig.getPartitionNexus();
- attrRegistry = dsConfig.getGlobalRegistries().getAttributeTypeRegistry();
- oidRegistry = dsConfig.getGlobalRegistries().getOidRegistry();
+ attrRegistry = dsConfig.getRegistries().getAttributeTypeRegistry();
+ oidRegistry = dsConfig.getRegistries().getOidRegistry();
env = dsConfig.getEnvironment();
Iterator suffixes = nexus.listSuffixes();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Dec 11 11:04:56 2006
@@ -41,7 +41,6 @@
import org.apache.directory.server.core.invocation.Invocation;
import org.apache.directory.server.core.invocation.InvocationStack;
import org.apache.directory.server.core.partition.PartitionNexus;
-import org.apache.directory.server.core.schema.global.GlobalRegistries;
import org.apache.directory.shared.ldap.exception.LdapAttributeInUseException;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeIdentifierException;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
@@ -108,7 +107,7 @@
/**
* the global schema object registries
*/
- private GlobalRegistries globalRegistries;
+ private Registries registries;
private Set binaries;
@@ -142,7 +141,7 @@
public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
{
nexus = factoryCfg.getPartitionNexus();
- globalRegistries = factoryCfg.getGlobalRegistries();
+ registries = factoryCfg.getRegistries();
binaryAttributeFilter = new BinaryAttributeFilter();
topFilter = new TopFilter();
filters.add( binaryAttributeFilter );
@@ -152,7 +151,7 @@
// stuff for dealing with subentries (garbage for now)
String subschemaSubentry = ( String ) nexus.getRootDSE().get( "subschemaSubentry" ).get();
subschemaSubentryDn = new LdapDN( subschemaSubentry );
- subschemaSubentryDn.normalize( globalRegistries.getAttributeTypeRegistry().getNormalizerMapping() );
+ subschemaSubentryDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
}
@@ -280,7 +279,7 @@
if ( returnAllOperationalAttributes || set.contains( "objectclasses" ) )
{
attr = new LockableAttributeImpl( "objectClasses" );
- Iterator list = globalRegistries.getObjectClassRegistry().list();
+ Iterator list = registries.getObjectClassRegistry().list();
while ( list.hasNext() )
{
ObjectClass oc = ( ObjectClass ) list.next();
@@ -292,7 +291,7 @@
if ( returnAllOperationalAttributes || set.contains( "attributetypes" ) )
{
attr = new LockableAttributeImpl( "attributeTypes" );
- Iterator list = globalRegistries.getAttributeTypeRegistry().list();
+ Iterator list = registries.getAttributeTypeRegistry().list();
while ( list.hasNext() )
{
AttributeType at = ( AttributeType ) list.next();
@@ -304,7 +303,7 @@
if ( returnAllOperationalAttributes || set.contains( "matchingrules" ) )
{
attr = new LockableAttributeImpl( "matchingRules" );
- Iterator list = globalRegistries.getMatchingRuleRegistry().list();
+ Iterator list = registries.getMatchingRuleRegistry().list();
while ( list.hasNext() )
{
MatchingRule mr = ( MatchingRule ) list.next();
@@ -316,7 +315,7 @@
if ( returnAllOperationalAttributes || set.contains( "matchingruleuse" ) )
{
attr = new LockableAttributeImpl( "matchingRuleUse" );
- Iterator list = globalRegistries.getMatchingRuleUseRegistry().list();
+ Iterator list = registries.getMatchingRuleUseRegistry().list();
while ( list.hasNext() )
{
MatchingRuleUse mru = ( MatchingRuleUse ) list.next();
@@ -328,7 +327,7 @@
if ( returnAllOperationalAttributes || set.contains( "ldapsyntaxes" ) )
{
attr = new LockableAttributeImpl( "ldapSyntaxes" );
- Iterator list = globalRegistries.getSyntaxRegistry().list();
+ Iterator list = registries.getSyntaxRegistry().list();
while ( list.hasNext() )
{
Syntax syntax = ( Syntax ) list.next();
@@ -340,7 +339,7 @@
if ( returnAllOperationalAttributes || set.contains( "ditcontentrules" ) )
{
attr = new LockableAttributeImpl( "dITContentRules" );
- Iterator list = globalRegistries.getDitContentRuleRegistry().list();
+ Iterator list = registries.getDitContentRuleRegistry().list();
while ( list.hasNext() )
{
DITContentRule dcr = ( DITContentRule ) list.next();
@@ -352,7 +351,7 @@
if ( returnAllOperationalAttributes || set.contains( "ditstructurerules" ) )
{
attr = new LockableAttributeImpl( "dITStructureRules" );
- Iterator list = globalRegistries.getDitStructureRuleRegistry().list();
+ Iterator list = registries.getDitStructureRuleRegistry().list();
while ( list.hasNext() )
{
DITStructureRule dsr = ( DITStructureRule ) list.next();
@@ -364,7 +363,7 @@
if ( returnAllOperationalAttributes || set.contains( "nameforms" ) )
{
attr = new LockableAttributeImpl( "nameForms" );
- Iterator list = globalRegistries.getNameFormRegistry().list();
+ Iterator list = registries.getNameFormRegistry().list();
while ( list.hasNext() )
{
NameForm nf = ( NameForm ) list.next();
@@ -476,8 +475,8 @@
*/
private boolean isRequired( String attrId, Attribute objectClass ) throws NamingException
{
- OidRegistry oidRegistry = globalRegistries.getOidRegistry();
- ObjectClassRegistry registry = globalRegistries.getObjectClassRegistry();
+ OidRegistry oidRegistry = registries.getOidRegistry();
+ ObjectClassRegistry registry = registries.getObjectClassRegistry();
if ( !oidRegistry.hasOid( attrId ) )
{
@@ -662,8 +661,8 @@
}
Attribute objectClass = getResultantObjectClasses( modOp, mods.get( "objectClass" ), entry.get( "objectClass" ) );
- ObjectClassRegistry ocRegistry = this.globalRegistries.getObjectClassRegistry();
- AttributeTypeRegistry atRegistry = this.globalRegistries.getAttributeTypeRegistry();
+ ObjectClassRegistry ocRegistry = this.registries.getObjectClassRegistry();
+ AttributeTypeRegistry atRegistry = this.registries.getAttributeTypeRegistry();
NamingEnumeration changes = mods.getIDs();
@@ -847,8 +846,8 @@
entry.get( "objectClass" ) );
}
- ObjectClassRegistry ocRegistry = this.globalRegistries.getObjectClassRegistry();
- AttributeTypeRegistry atRegistry = this.globalRegistries.getAttributeTypeRegistry();
+ ObjectClassRegistry ocRegistry = this.registries.getObjectClassRegistry();
+ AttributeTypeRegistry atRegistry = this.registries.getAttributeTypeRegistry();
// -------------------------------------------------------------------
// DIRSERVER-646 Fix: Replacing an unknown attribute with no values
@@ -922,14 +921,14 @@
tmpEntry.remove( change.getID() );
SchemaChecker.preventRdnChangeOnModifyRemove( name, modOp, change,
- this.globalRegistries.getOidRegistry() );
+ this.registries.getOidRegistry() );
SchemaChecker
.preventStructuralClassRemovalOnModifyRemove( ocRegistry, name, modOp, change, objectClass );
break;
case DirContext.REPLACE_ATTRIBUTE :
SchemaChecker.preventRdnChangeOnModifyReplace( name, modOp, change,
- globalRegistries.getOidRegistry() );
+ registries.getOidRegistry() );
SchemaChecker.preventStructuralClassRemovalOnModifyReplace( ocRegistry, name, modOp, change );
attr = tmpEntry.get( change.getID() );
@@ -1046,9 +1045,9 @@
AttributeType type = null;
boolean asBinary = false;
- if ( globalRegistries.getAttributeTypeRegistry().hasAttributeType( id ) )
+ if ( registries.getAttributeTypeRegistry().hasAttributeType( id ) )
{
- type = globalRegistries.getAttributeTypeRegistry().lookup( id );
+ type = registries.getAttributeTypeRegistry().lookup( id );
}
if ( type != null )
@@ -1123,7 +1122,7 @@
*/
public void add( NextInterceptor next, LdapDN normName, Attributes attrs ) throws NamingException
{
- AttributeTypeRegistry atRegistry = this.globalRegistries.getAttributeTypeRegistry();
+ AttributeTypeRegistry atRegistry = this.registries.getAttributeTypeRegistry();
NamingEnumeration attrEnum = attrs.getIDs();
while ( attrEnum.hasMoreElements() )
{
@@ -1139,7 +1138,7 @@
}
}
- alterObjectClasses( attrs.get( "objectClass" ), this.globalRegistries.getObjectClassRegistry() );
+ alterObjectClasses( attrs.get( "objectClass" ), this.registries.getObjectClassRegistry() );
assertRequiredAttributesPresent( attrs );
assertNumberOfAttributeValuesValid( attrs );
next.add(normName, attrs );
@@ -1165,7 +1164,7 @@
*/
private void assertNumberOfAttributeValuesValid( Attribute attribute ) throws InvalidAttributeValueException, NamingException
{
- AttributeTypeRegistry registry = this.globalRegistries.getAttributeTypeRegistry();
+ AttributeTypeRegistry registry = this.registries.getAttributeTypeRegistry();
if ( attribute.size() > 1 && registry.lookup( attribute.getID() ).isSingleValue() )
{
@@ -1181,7 +1180,7 @@
throws NamingException
{
AttributeType[] required = getRequiredAttributes( entry.get( "objectClass" ),
- this.globalRegistries.getObjectClassRegistry() );
+ this.registries.getObjectClassRegistry() );
for ( int ii = 0; ii < required.length; ii++ )
{
boolean aliasFound = false;
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java Mon Dec 11 11:04:56 2006
@@ -116,8 +116,8 @@
super.init( factoryCfg, cfg );
this.nexus = factoryCfg.getPartitionNexus();
this.factoryCfg = factoryCfg;
- this.attrRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
- this.oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();
+ this.attrRegistry = factoryCfg.getRegistries().getAttributeTypeRegistry();
+ this.oidRegistry = factoryCfg.getRegistries().getOidRegistry();
// setup various attribute type values
objectClassType = attrRegistry.lookup( oidRegistry.getOid( "objectClass" ) );
@@ -129,7 +129,7 @@
return attrRegistry.getNormalizerMapping();
}
}, attrRegistry.getNormalizerMapping() );
- evaluator = new SubtreeEvaluator( factoryCfg.getGlobalRegistries().getOidRegistry() );
+ evaluator = new SubtreeEvaluator( factoryCfg.getRegistries().getOidRegistry() );
// prepare to find all subentries in all namingContexts
Iterator suffixes = this.nexus.listSuffixes();
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerService.java Mon Dec 11 11:04:56 2006
@@ -215,7 +215,7 @@
{
super.init( dirServCfg, intCfg );
triggerSpecCache = new TriggerSpecCache( dirServCfg );
- attrRegistry = dirServCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ attrRegistry = dirServCfg.getRegistries().getAttributeTypeRegistry();
triggerParser = new TriggerSpecificationParser
( new NormalizerMappingResolver()
{
Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java Mon Dec 11 11:04:56 2006
@@ -91,8 +91,8 @@
public TriggerSpecCache( DirectoryServiceConfiguration dirServCfg ) throws NamingException
{
this.nexus = dirServCfg.getPartitionNexus();
- attrRegistry = dirServCfg.getGlobalRegistries().getAttributeTypeRegistry();
- final AttributeTypeRegistry registry = dirServCfg.getGlobalRegistries().getAttributeTypeRegistry();
+ attrRegistry = dirServCfg.getRegistries().getAttributeTypeRegistry();
+ final AttributeTypeRegistry registry = dirServCfg.getRegistries().getAttributeTypeRegistry();
triggerSpecParser = new TriggerSpecificationParser( new NormalizerMappingResolver()
{
public Map getNormalizerMapping() throws NamingException
Modified: directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java?view=diff&rev=485822&r1=485821&r2=485822
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/test/java/org/apache/directory/server/core/schema/SchemaCheckerTest.java Mon Dec 11 11:04:56 2006
@@ -50,7 +50,7 @@
*/
public class SchemaCheckerTest extends TestCase
{
- GlobalRegistries registries = null;
+ Registries registries = null;
public SchemaCheckerTest() throws NamingException