directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r883172 - in /directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core: partition/AbstractPartition.java schema/SchemaPartition.java
Date Sun, 22 Nov 2009 22:47:53 GMT
Author: elecharny
Date: Sun Nov 22 22:47:52 2009
New Revision: 883172

URL: http://svn.apache.org/viewvc?rev=883172&view=rev
Log:
Registries are not anymore injected into the partitions

Modified:
    directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
    directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java

Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java?rev=883172&r1=883171&r2=883172&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/partition/AbstractPartition.java
Sun Nov 22 22:47:52 2009
@@ -26,7 +26,6 @@
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
 import org.apache.directory.server.core.interceptor.context.LookupOperationContext;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
 
 
 /**
@@ -42,31 +41,8 @@
     /** <tt>true</tt> if and only if this partition is initialized. */
     protected boolean initialized;
 
-    /** the registries managed by this Partition */
-    protected Registries registries;
-    
-
     protected AbstractPartition()
     {
-        registries = new Registries();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setRegistries( Registries registries )
-    {
-        this.registries = registries;
-    }
-    
-    
-    /**
-     * {@inheritDoc}
-     */
-    public Registries getRegistries()
-    {
-        return registries;
     }
     
     

Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=883172&r1=883171&r2=883172&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
Sun Nov 22 22:47:52 2009
@@ -57,7 +57,6 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
-import org.apache.directory.shared.ldap.schema.registries.Registries;
 import org.apache.directory.shared.ldap.util.DateUtils;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.slf4j.Logger;
@@ -155,16 +154,6 @@
 
 
     /**
-     * Gets the Registries in this {@link SchemaPartition}.  Will be null 
-     * until this partition is initialized.
-     */
-    public Registries getRegistries()
-    {
-        return registries;
-    }
-    
-    
-    /**
      * Get's the ID which is fixed: 'schema'.
      */
     public final String getId()
@@ -502,13 +491,13 @@
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE, 
             new DefaultServerAttribute( 
                 ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT,
-                registries.getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT
),
+                schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFY_TIMESTAMP_AT
),
                 modifyTimestamp ) ) );
         
         mods.add( new ServerModification( ModificationOperation.REPLACE_ATTRIBUTE,
             new DefaultServerAttribute( 
                 ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT, 
-                registries.getAttributeTypeRegistry().lookup( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT
),
+                schemaManager.lookupAttributeTypeRegistry( ApacheSchemaConstants.SCHEMA_MODIFIERS_NAME_AT
),
                 modifiersName ) ) );
         
         opContext.modify( schemaModificationDN, mods, ByPassConstants.SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS
);



Mime
View raw message