directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r891667 [1/2] - in /directory: apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/ apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/serv...
Date Thu, 17 Dec 2009 12:08:47 GMT
Author: elecharny
Date: Thu Dec 17 12:08:31 2009
New Revision: 891667

URL: http://svn.apache.org/viewvc?rev=891667&view=rev
Log:
Renamed the SchemaManager.getOidRegistry() to SchemaManager.getGlobalOidRegistry() to avoid confusion

Modified:
    directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
    directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerDelTest.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerEnableDisableLoadTest.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadTest.java
    directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerLoadWithDepsTest.java
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/SchemaManager.java

Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Thu Dec 17 12:08:31 2009
@@ -164,7 +164,7 @@
     {
         String oid = getOid( entry );
 
-        if ( schemaManager.getOidRegistry().contains( oid ) )
+        if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
             throw new LdapNamingException( "Oid " + oid + " for new schema entity is not unique.",
                 ResultCodeEnum.OTHER );
@@ -180,9 +180,9 @@
     {
         String oid = getOid( entry );
 
-        if ( schemaManager.getOidRegistry().contains( oid ) )
+        if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
-            return schemaManager.getOidRegistry().getSchemaObject( oid );
+            return schemaManager.getGlobalOidRegistry().getSchemaObject( oid );
         }
         else
         {
@@ -225,7 +225,7 @@
     {
         String oid = schemaObject.getOid();
 
-        if ( schemaManager.getOidRegistry().contains( oid ) )
+        if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
             throw new LdapSchemaViolationException( "Oid " + oid + " for new schema entity is not unique.",
                 ResultCodeEnum.OTHER );
@@ -235,7 +235,7 @@
 
     protected void checkOidIsUnique( String oid ) throws Exception
     {
-        if ( schemaManager.getOidRegistry().contains( oid ) )
+        if ( schemaManager.getGlobalOidRegistry().contains( oid ) )
         {
             throw new LdapSchemaViolationException( "Oid " + oid + " for new schema entity is not unique.",
                 ResultCodeEnum.OTHER );
@@ -380,7 +380,7 @@
      */
     protected void unregisterOids( SchemaObject obj ) throws Exception
     {
-        schemaManager.getOidRegistry().unregister( obj.getOid() );
+        schemaManager.getGlobalOidRegistry().unregister( obj.getOid() );
     }
     
     
@@ -392,7 +392,7 @@
      */
     protected void registerOids( SchemaObject obj ) throws Exception
     {
-        schemaManager.getOidRegistry().register( obj );
+        schemaManager.getGlobalOidRegistry().register( obj );
     }
     
     

Modified: directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -468,7 +468,7 @@
         assertTrue( "comparator should still be in the registry after rename failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -554,7 +554,7 @@
         assertTrue( "comparator should still be in the registry after move failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -584,7 +584,7 @@
         assertTrue( "comparator should still be in the registry after move failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -450,7 +450,7 @@
         assertTrue( "normalizer should still be in the registry after delete failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
     
     
@@ -480,7 +480,7 @@
         assertTrue( "normalizer should still be in the registry after move failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -510,7 +510,7 @@
         assertTrue( "normalizer should still be in the registry after move failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
     
@@ -538,7 +538,7 @@
         assertTrue( "normalizer should still be in the registry after rename failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ-2/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -450,7 +450,7 @@
         assertTrue( "syntaxChecker should still be in the registry after delete failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
     
     
@@ -480,7 +480,7 @@
         assertTrue( "syntaxChecker should still be in the registry after move failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -510,7 +510,7 @@
         assertTrue( "syntaxChecker should still be in the registry after move failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
     
@@ -538,7 +538,7 @@
         assertTrue( "syntaxChecker should still be in the registry after rename failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -204,7 +204,7 @@
             service.getSchemaManager().getAttributeTypeRegistry().contains( OID ) );
         
         // The GlobalOidRegistries must not contain the AT
-        assertFalse( service.getSchemaManager().getOidRegistry().contains( OID ) );
+        assertFalse( service.getSchemaManager().getGlobalOidRegistry().contains( OID ) );
         
         // The added entry must be present on disk
         assertTrue( isOnDisk( dn ) );
@@ -267,7 +267,7 @@
         // Check in Registries
         assertFalse( "attributeType should be removed from the registry after being deleted", 
             service.getSchemaManager().getAttributeTypeRegistry().contains( OID ) );
-        assertFalse( service.getSchemaManager().getOidRegistry().contains( OID ) );
+        assertFalse( service.getSchemaManager().getGlobalOidRegistry().contains( OID ) );
         
         // Check on disk that the deleted SchemaObject does not exist anymore
         assertFalse( isOnDisk( dn ) );

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -468,7 +468,7 @@
         assertTrue( "comparator should still be in the registry after rename failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -554,7 +554,7 @@
         assertTrue( "comparator should still be in the registry after move failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -584,7 +584,7 @@
         assertTrue( "comparator should still be in the registry after move failure", schemaManager
             .getComparatorRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        service.getSchemaManager().getOidRegistry().unregister( OID );
+        service.getSchemaManager().getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -450,7 +450,7 @@
         assertTrue( "normalizer should still be in the registry after delete failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
     
     
@@ -480,7 +480,7 @@
         assertTrue( "normalizer should still be in the registry after move failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -510,7 +510,7 @@
         assertTrue( "normalizer should still be in the registry after move failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
     
@@ -538,7 +538,7 @@
         assertTrue( "normalizer should still be in the registry after rename failure", 
             schemaManager.getNormalizerRegistry().contains( OID ) );
         schemaManager.getMatchingRuleRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Thu Dec 17 12:08:31 2009
@@ -450,7 +450,7 @@
         assertTrue( "syntaxChecker should still be in the registry after delete failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
     
     
@@ -480,7 +480,7 @@
         assertTrue( "syntaxChecker should still be in the registry after move failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 
@@ -510,7 +510,7 @@
         assertTrue( "syntaxChecker should still be in the registry after move failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
     
@@ -538,7 +538,7 @@
         assertTrue( "syntaxChecker should still be in the registry after rename failure", 
             schemaManager.getSyntaxCheckerRegistry().contains( OID ) );
         schemaManager.getLdapSyntaxRegistry().unregister( OID );
-        schemaManager.getOidRegistry().unregister( OID );
+        schemaManager.getGlobalOidRegistry().unregister( OID );
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Dec 17 12:08:31 2009
@@ -220,7 +220,7 @@
         subentryAciType = schemaManager.lookupAttributeTypeRegistry( SchemaConstants.SUBENTRY_ACI_AT_OID );
         
         aciParser = new ACIItemParser( new ConcreteNameComponentNormalizer( schemaManager ), schemaManager.getNormalizerMapping() );
-        engine = new ACDFEngine( schemaManager.getOidRegistry(), schemaManager );
+        engine = new ACDFEngine( schemaManager.getGlobalOidRegistry(), schemaManager );
         chain = directoryService.getInterceptorChain();
         enabled = directoryService.isAccessControlEnabled();
 

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Thu Dec 17 12:08:31 2009
@@ -81,7 +81,7 @@
         super.init( ds );
         
         this.ds = ds;
-        OidRegistry oidRegistry = ds.getSchemaManager().getOidRegistry();
+        OidRegistry oidRegistry = ds.getSchemaManager().getGlobalOidRegistry();
         SchemaManager schemaManager = ds.getSchemaManager();
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager );
         filterNormalizer = new FilterNormalizingVisitor( ncn, schemaManager );

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Thu Dec 17 12:08:31 2009
@@ -832,7 +832,7 @@
      */
     private boolean isRequired( String attrId, EntryAttribute objectClasses ) throws Exception
     {
-        OidRegistry oidRegistry = schemaManager.getOidRegistry();
+        OidRegistry oidRegistry = schemaManager.getGlobalOidRegistry();
 
         if ( !oidRegistry.contains( attrId ) )
         {

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Thu Dec 17 12:08:31 2009
@@ -138,7 +138,7 @@
         super.init( directoryService );
         nexus = directoryService.getPartitionNexus();
         schemaManager = directoryService.getSchemaManager();
-        oidRegistry = schemaManager.getOidRegistry();
+        oidRegistry = schemaManager.getGlobalOidRegistry();
 
         // setup various attribute type values
         objectClassType = schemaManager.lookupAttributeTypeRegistry( schemaManager.getAttributeTypeRegistry().getOidByName( SchemaConstants.OBJECT_CLASS_AT ) );

Modified: directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-schema/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Thu Dec 17 12:08:31 2009
@@ -100,7 +100,7 @@
             fail( "Schema load failed : " + ExceptionUtils.printErrors( schemaManager.getErrors() ) );
         }
 
-        OID_REGISTRY = schemaManager.getOidRegistry();
+        OID_REGISTRY = schemaManager.getGlobalOidRegistry();
 
         GROUP_NAME = new LdapDN( "ou=test,ou=groups,ou=system" );
         USER_NAME = new LdapDN( "ou=test, ou=users, ou=system" );

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=891667&r1=891666&r2=891667&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 Thu Dec 17 12:08:31 2009
@@ -96,7 +96,7 @@
     public void initTest()
     {
         visitor = new FilterNormalizingVisitor( ncn, schemaManager );
-        evaluator = new SubtreeEvaluator( schemaManager.getOidRegistry(), schemaManager );
+        evaluator = new SubtreeEvaluator( schemaManager.getGlobalOidRegistry(), schemaManager );
     }
 
 

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java Thu Dec 17 12:08:31 2009
@@ -1702,7 +1702,7 @@
     /**
      * {@inheritDoc}
      */
-    public OidRegistry getOidRegistry()
+    public OidRegistry getGlobalOidRegistry()
     {
         return registries.getGlobalOidRegistry();
     }

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java?rev=891667&r1=891666&r2=891667&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/test/java/org/apache/directory/server/schema/SchemaManagerAddTest.java Thu Dec 17 12:08:31 2009
@@ -226,7 +226,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -244,7 +244,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -256,7 +256,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -271,7 +271,7 @@
 
         assertTrue( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -283,7 +283,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -304,7 +304,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -316,7 +316,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -337,7 +337,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -349,7 +349,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -364,7 +364,7 @@
 
         assertTrue( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -376,7 +376,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "0.0" );
@@ -396,7 +396,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -408,7 +408,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -428,7 +428,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -440,7 +440,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -460,7 +460,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -472,7 +472,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -486,7 +486,7 @@
 
         assertTrue( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -498,7 +498,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "2.5.18.4" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -521,7 +521,7 @@
         AttributeType original = schemaManager.lookupAttributeTypeRegistry( "2.5.18.4" );
         assertEquals( "distinguishedNameMatch", original.getEqualityOid() );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -533,7 +533,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -555,7 +555,7 @@
         assertFalse( isATPresent( schemaManager, "1.1.1.0" ) );
 
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -567,7 +567,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.1.0" );
         attributeType.setEqualityOid( "2.5.13.1" );
@@ -586,7 +586,7 @@
         assertTrue( isATPresent( schemaManager, "1.1.1.0" ) );
 
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
 
         AttributeType added = schemaManager.lookupAttributeTypeRegistry( "referral" );
         assertNotNull( added );
@@ -607,7 +607,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -624,7 +624,7 @@
         assertEquals( "1.3.6.1.4.1.1466.115.121.1.12", result.getSyntaxOid() );
         assertEquals( "2.5.13.1", result.getEqualityOid() );
         assertEquals( atrSize + 1, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -636,7 +636,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -656,7 +656,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -668,7 +668,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -688,7 +688,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -700,7 +700,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int atrSize = schemaManager.getAttributeTypeRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         AttributeType attributeType = new AttributeType( "1.1.0" );
         attributeType.setEqualityOid( null );
@@ -720,7 +720,7 @@
 
         assertFalse( isATPresent( schemaManager, "1.1.0" ) );
         assertEquals( atrSize, schemaManager.getAttributeTypeRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -732,7 +732,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         LdapComparator<?> lc = new BooleanComparator( oid );
@@ -743,7 +743,7 @@
         assertEquals( 0, errors.size() );
 
         assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         LdapComparator<?> added = schemaManager.lookupComparatorRegistry( oid );
 
@@ -757,7 +757,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         LdapComparator<?> bc = new BooleanComparator( oid );
@@ -772,7 +772,7 @@
         List<Throwable> errors = schemaManager.getErrors();
         assertEquals( 0, errors.size() );
         assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         LdapComparator<?> lc = new CsnComparator( oid );
 
@@ -782,7 +782,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( ctrSize + 1, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         added = schemaManager.lookupComparatorRegistry( oid );
 
@@ -799,7 +799,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ctrSize = schemaManager.getComparatorRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         LdapComparator<?> lc = new BooleanComparator( oid );
@@ -814,7 +814,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( ctrSize, schemaManager.getComparatorRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         try
         {
@@ -850,7 +850,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
@@ -867,7 +867,7 @@
         assertEquals( ComparableComparator.class.getName(), added.getLdapComparator().getClass().getName() );
 
         assertEquals( mrrSize + 1, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -879,7 +879,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
 
@@ -895,7 +895,7 @@
         assertFalse( isMRPresent( schemaManager, "1.1.0" ) );
 
         assertEquals( mrrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -907,7 +907,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "2.5.13.0" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
@@ -928,7 +928,7 @@
         assertEquals( "objectIdentifierMatch", existing.getName() );
 
         assertEquals( mrrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -940,7 +940,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
         matchingRule.setNames( "Test", "objectIdentifierMatch" );
@@ -956,7 +956,7 @@
         assertTrue( error instanceof LdapSchemaViolationException );
 
         assertEquals( mrrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -968,7 +968,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
         matchingRule.setNames( "Test", "cn" );
@@ -989,7 +989,7 @@
         assertTrue( added.getNames().contains( "Test" ) );
 
         assertEquals( mrrSize + 1, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1001,7 +1001,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
         matchingRule.setNames( "Test" );
@@ -1017,7 +1017,7 @@
         assertTrue( error instanceof LdapSchemaViolationException );
 
         assertEquals( mrrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1029,7 +1029,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         MatchingRule matchingRule = new MatchingRule( "1.1.0" );
         matchingRule.setNames( "Test" );
@@ -1049,7 +1049,7 @@
         assertFalse( isMRPresent( schemaManager, "1.1.0" ) );
 
         assertEquals( mrrSize, schemaManager.getMatchingRuleRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1071,7 +1071,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         Normalizer normalizer = new NoOpNormalizer( oid );
@@ -1082,7 +1082,7 @@
         assertEquals( 0, errors.size() );
 
         assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         Normalizer added = schemaManager.lookupNormalizerRegistry( oid );
 
@@ -1096,7 +1096,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         Normalizer normalizer = new NoOpNormalizer( oid );
@@ -1111,7 +1111,7 @@
         List<Throwable> errors = schemaManager.getErrors();
         assertEquals( 0, errors.size() );
         assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         Normalizer normalizer2 = new NoOpNormalizer( oid );
 
@@ -1121,7 +1121,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( nrSize + 1, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         added = schemaManager.lookupNormalizerRegistry( oid );
 
@@ -1138,7 +1138,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getNormalizerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         Normalizer normalizer = new NoOpNormalizer( oid );
@@ -1154,7 +1154,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( nrSize, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         try
         {
@@ -1183,7 +1183,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
 
@@ -1196,7 +1196,7 @@
         assertNotNull( added );
 
         assertEquals( ocrSize + 1, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1208,7 +1208,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "2.5.17.0" );
 
@@ -1224,7 +1224,7 @@
         assertNotNull( added );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1236,7 +1236,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.0" );
         objectClass.setNames( "Test", "referral" );
@@ -1251,7 +1251,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.0" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1263,7 +1263,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test", "cn" );
@@ -1279,7 +1279,7 @@
         assertTrue( added.getNames().contains( "cn" ) );
 
         assertEquals( ocrSize + 1, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1291,7 +1291,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.addMayAttributeTypeOids( "cn", "none", "sn" );
@@ -1306,7 +1306,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1318,7 +1318,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.addMustAttributeTypeOids( "cn", "none", "sn" );
@@ -1333,7 +1333,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1345,7 +1345,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.addMayAttributeTypeOids( "cn", "ref", "commonName" );
@@ -1358,7 +1358,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1370,7 +1370,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.addMustAttributeTypeOids( "cn", "ref", "2.5.4.3" );
@@ -1383,7 +1383,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1395,7 +1395,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.addMustAttributeTypeOids( "cn", "ref" );
@@ -1410,7 +1410,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1425,7 +1425,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1455,7 +1455,7 @@
         }
 
         assertEquals( ocrSize + 1, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1467,7 +1467,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1481,7 +1481,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1493,7 +1493,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
 
         objectClass.setNames( "Test" );
@@ -1507,7 +1507,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1519,7 +1519,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1533,7 +1533,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1545,7 +1545,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1559,7 +1559,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1571,7 +1571,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1585,7 +1585,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1597,7 +1597,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1611,7 +1611,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1623,7 +1623,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1637,7 +1637,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1650,7 +1650,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1680,7 +1680,7 @@
         }
 
         assertEquals( ocrSize + 1, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1693,7 +1693,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int ocrSize = schemaManager.getObjectClassRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         ObjectClass objectClass = new ObjectClass( "1.1.1" );
         objectClass.setNames( "Test" );
@@ -1710,7 +1710,7 @@
         assertFalse( isOCPresent( schemaManager, "1.1.1" ) );
 
         assertEquals( ocrSize, schemaManager.getObjectClassRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1726,7 +1726,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapSyntax syntax = new LdapSyntax( "1.1.0" );
 
@@ -1743,7 +1743,7 @@
 
         assertTrue( isSyntaxPresent( schemaManager, "1.1.0" ) );
         assertEquals( sSize + 1, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize + 1, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize + 1, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1755,7 +1755,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int sSize = schemaManager.getLdapSyntaxRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         LdapSyntax syntax = new LdapSyntax( "2.5.4.3" );
 
@@ -1768,7 +1768,7 @@
 
         assertTrue( error instanceof LdapSchemaViolationException );
         assertEquals( sSize, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
     }
 
 
@@ -1780,7 +1780,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         SyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
@@ -1791,7 +1791,7 @@
         assertEquals( 0, errors.size() );
 
         assertEquals( nrSize + 1, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         SyntaxChecker added = schemaManager.lookupSyntaxCheckerRegistry( oid );
 
@@ -1805,7 +1805,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         SyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
@@ -1820,7 +1820,7 @@
         List<Throwable> errors = schemaManager.getErrors();
         assertEquals( 0, errors.size() );
         assertEquals( nrSize + 1, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         SyntaxChecker syntaxChecker2 = new RegexSyntaxChecker( oid );
 
@@ -1830,7 +1830,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( nrSize + 1, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         added = schemaManager.lookupSyntaxCheckerRegistry( oid );
 
@@ -1847,7 +1847,7 @@
     {
         SchemaManager schemaManager = loadSystem();
         int nrSize = schemaManager.getSyntaxCheckerRegistry().size();
-        int goidSize = schemaManager.getOidRegistry().size();
+        int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         String oid = "0.0.0";
         SyntaxChecker syntaxChecker = new RegexSyntaxChecker( oid );
@@ -1863,7 +1863,7 @@
         assertEquals( 1, errors.size() );
 
         assertEquals( nrSize, schemaManager.getSyntaxCheckerRegistry().size() );
-        assertEquals( goidSize, schemaManager.getOidRegistry().size() );
+        assertEquals( goidSize, schemaManager.getGlobalOidRegistry().size() );
 
         try
         {



Mime
View raw message