directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r201550 [4/5] - in /directory/apacheds/trunk/core: ./ src/main/aspects/ src/main/java/org/apache/ldap/server/ src/main/java/org/apache/ldap/server/authn/ src/main/java/org/apache/ldap/server/authz/ src/main/java/org/apache/ldap/server/confi...
Date Fri, 24 Jun 2005 03:08:39 GMT
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java Thu Jun 23 20:08:31 2005
@@ -17,9 +17,7 @@
 package org.apache.ldap.server.jndi;
 
 
-import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.server.PartitionNexus;
-import org.apache.ldap.server.authn.LdapPrincipal;
+import java.util.Hashtable;
 
 import javax.naming.Name;
 import javax.naming.NamingException;
@@ -27,11 +25,14 @@
 import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapContext;
-import java.util.Hashtable;
+
+import org.apache.ldap.common.NotImplementedException;
+import org.apache.ldap.server.authn.LdapPrincipal;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 
 
 /**
- * An Eve implementation of a JNDI LdapContext.
+ * An implementation of a JNDI LdapContext.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
@@ -47,13 +48,13 @@
     /**
      * Creates an instance of an ServerLdapContext.
      *
-     * @param nexusProxy the proxy to a partition nexus
+     * @param service the parent service that manages this context
      * @param env the JNDI environment parameters
      * @throws NamingException the context cannot be created
      */
-    public ServerLdapContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
+    public ServerLdapContext( ContextFactoryService service, Hashtable env ) throws NamingException
     {
-        super( nexusProxy, env );
+        super( service, env );
     }
 
 
@@ -66,7 +67,7 @@
      * @param env the environment properties used by this context
      * @param dn the distinguished name of this context
      */
-    ServerLdapContext( LdapPrincipal principal, PartitionNexus nexusProxy, Hashtable env, Name dn )
+    ServerLdapContext( LdapPrincipal principal, ContextPartitionNexus nexusProxy, Hashtable env, Name dn )
     {
         super( principal, nexusProxy, env, dn );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java Thu Jun 23 20:08:31 2005
@@ -17,22 +17,31 @@
 package org.apache.ldap.server.normalization;
 
 
+import java.util.Map;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.name.DnParser;
+import org.apache.ldap.common.name.NameComponentNormalizer;
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.InterceptorContext;
 import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.invocation.*;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
-import org.apache.ldap.common.name.NameComponentNormalizer;
-import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.common.schema.AttributeType;
-
-import javax.naming.NamingException;
 
 
 /**
  * A name normalization service.  This service makes sure all relative and distinuished
  * names are normalized before calls are made against the respective interface methods
- * on the root nexus.
+ * on {@link ContextPartitionNexus}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
@@ -42,10 +51,9 @@
     private DnParser parser;
 
 
-    public void init( InterceptorContext context ) throws NamingException
+    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
-        AttributeTypeRegistry attributeRegistry = context.getGlobalRegistries().getAttributeTypeRegistry();
-
+        AttributeTypeRegistry attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         parser = new DnParser( new PerComponentNormalizer( attributeRegistry ) );
     }
 
@@ -56,154 +64,155 @@
 
 
     // ------------------------------------------------------------------------
-    // Normalize all Name based arguments for BackingStore interface operations
+    // Normalize all Name based arguments for ContextPartition interface operations
     // ------------------------------------------------------------------------
 
 
-    protected void process( NextInterceptor nextInterceptor, Add call ) throws NamingException
+    public void add( NextInterceptor nextInterceptor, String upName, Name normName, Attributes attrs ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            normName = parser.parse( normName.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.add( upName, normName, attrs );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Delete call ) throws NamingException
+    public void delete( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.delete( name );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Modify call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, int modOp, Attributes attrs ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.modify( name, modOp, attrs );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyMany call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, ModificationItem[] items ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.modify( name, items );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyRN call ) throws NamingException
+    public void modifyRn( NextInterceptor nextInterceptor, Name name, String newRn, boolean deleteOldRn ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.modifyRn( name, newRn, deleteOldRn );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Move call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor, Name name, Name newParentName ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
-
-            call.setNewParentName( parser.parse( call.getNewParentName().toString() ) );
+            name = parser.parse( name.toString() );
+            newParentName = parser.parse( newParentName.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.move( name, newParentName );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, MoveAndModifyRN call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor, Name name, Name newParentName, String newRn, boolean deleteOldRn ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
 
-            call.setNewParentName( parser.parse( call.getNewParentName().toString() ) );
+            newParentName = parser.parse( newParentName.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        nextInterceptor.move( name, newParentName, newRn, deleteOldRn );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Search call ) throws NamingException
+    public NamingEnumeration search( NextInterceptor nextInterceptor,
+            Name base, Map env, ExprNode filter,
+            SearchControls searchCtls ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setBaseName( parser.parse( call.getBaseName().toString() ) );
+            base = parser.parse( base.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.search( base, env, filter, searchCtls );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, HasEntry call ) throws NamingException
+    public boolean hasEntry( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.hasEntry( name );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, IsSuffix call ) throws NamingException
+    public boolean isSuffix( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.isSuffix( name );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, List call ) throws NamingException
+    public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setBaseName( parser.parse( call.getBaseName().toString() ) );
+            base = parser.parse( base.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.list( base );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Lookup call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.lookup( name );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, LookupWithAttrIds call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.lookup( name, attrIds );
     }
 
 
@@ -212,25 +221,25 @@
     // ------------------------------------------------------------------------
 
 
-    protected void process( NextInterceptor nextInterceptor, GetMatchedDN call ) throws NamingException
+    public Name getMatchedName( NextInterceptor nextInterceptor, Name name, boolean normalized ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.getMatchedName( name, normalized );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, GetSuffix call ) throws NamingException
+    public Name getSuffix( NextInterceptor nextInterceptor, Name name, boolean normalized ) throws NamingException
     {
         synchronized( parser )
         {
-            call.setName( parser.parse( call.getName().toString() ) );
+            name = parser.parse( name.toString() );
         }
 
-        super.process( nextInterceptor, call );
+        return nextInterceptor.getSuffix( name, normalized );
     }
 
 
@@ -239,7 +248,7 @@
      * A normalizer that normalizes each name component specifically according to
      * the attribute type of the name component.
      */
-    class PerComponentNormalizer implements NameComponentNormalizer
+    private class PerComponentNormalizer implements NameComponentNormalizer
     {
         /** the attribute type registry we use to lookup component normalizers */
         private final AttributeTypeRegistry registry;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java Thu Jun 23 20:08:31 2005
@@ -17,31 +17,42 @@
 package org.apache.ldap.server.operational;
 
 
+import java.util.HashSet;
+import java.util.Map;
+
+import javax.naming.Name;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+import javax.naming.ldap.LdapContext;
+
+import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.UsageEnum;
 import org.apache.ldap.common.util.DateUtils;
-import org.apache.ldap.server.RootNexus;
+import org.apache.ldap.server.configuration.InterceptorConfiguration;
+import org.apache.ldap.server.enumeration.SearchResultFilter;
+import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
-import org.apache.ldap.server.interceptor.InterceptorContext;
+import org.apache.ldap.server.interceptor.Interceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
-import org.apache.ldap.server.db.ResultFilteringEnumeration;
-import org.apache.ldap.server.db.SearchResultFilter;
-import org.apache.ldap.server.invocation.*;
+import org.apache.ldap.server.invocation.InvocationStack;
+import org.apache.ldap.server.jndi.ContextFactoryConfiguration;
+import org.apache.ldap.server.partition.ContextPartitionNexus;
 import org.apache.ldap.server.schema.AttributeTypeRegistry;
 
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.*;
-import javax.naming.ldap.LdapContext;
-import java.util.HashSet;
-
 
 /**
- * An {@link org.apache.ldap.server.interceptor.Interceptor} that adds or modifies the default attributes
- * of entries. There are four default attributes for now;<code>'creatorsName'
- * </code>, <code>'createTimestamp'</code>, <code>'modifiersName'</code>, and
- * <code>'modifyTimestamp'</code>.
+ * An {@link Interceptor} that adds or modifies the default attributes
+ * of entries. There are four default attributes for now;
+ * <tt>'creatorsName'</tt>, <tt>'createTimestamp'</tt>, <tt>'modifiersName'</tt>,
+ * and <tt>'modifyTimestamp'</tt>.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -68,7 +79,7 @@
     /**
      * the root nexus of the system
      */
-    private RootNexus nexus;
+    private ContextPartitionNexus nexus;
 
     private AttributeTypeRegistry registry;
 
@@ -81,10 +92,10 @@
     }
 
 
-    public void init( InterceptorContext ctx ) throws NamingException
+    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
-        nexus = ctx.getRootNexus();
-        registry = ctx.getGlobalRegistries().getAttributeTypeRegistry();
+        nexus = factoryCfg.getPartitionNexus();
+        registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
     }
 
 
@@ -96,10 +107,9 @@
     /**
      * Adds extra operational attributes to the entry before it is added.
      */
-    protected void process( NextInterceptor nextInterceptor, Add call ) throws NamingException
+    public void add( NextInterceptor nextInterceptor, String upName, Name normName, Attributes entry ) throws NamingException
     {
-        String principal = getPrincipal( call ).getName();
-        Attributes entry = call.getAttributes();
+        String principal = getPrincipal().getName();
 
         BasicAttribute attribute = new BasicAttribute( "creatorsName" );
         attribute.add( principal );
@@ -109,157 +119,148 @@
         attribute.add( DateUtils.getGeneralizedTime() );
         entry.put( attribute );
 
-        nextInterceptor.process( call );
+        nextInterceptor.add( upName, normName, entry );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Modify call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, int modOp, Attributes attrs) throws NamingException
     {
-        nextInterceptor.process( call );
+        nextInterceptor.modify( name, modOp, attrs );
         
         // add operational attributes after call in case the operation fails
         Attributes attributes = new BasicAttributes();
         BasicAttribute attribute = new BasicAttribute( "modifiersName" );
-        attribute.add( getPrincipal( call ).getName() );
+        attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
         attribute = new BasicAttribute( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
-        nexus.modify( call.getName(), DirContext.REPLACE_ATTRIBUTE, attributes );
+        nexus.modify( name, DirContext.REPLACE_ATTRIBUTE, attributes );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyMany call ) throws NamingException
+    public void modify( NextInterceptor nextInterceptor, Name name, ModificationItem[] items ) throws NamingException
     {
-        nextInterceptor.process( call );
+        nextInterceptor.modify( name, items );
 
         // add operational attributes after call in case the operation fails
         Attributes attributes = new BasicAttributes();
         BasicAttribute attribute = new BasicAttribute( "modifiersName" );
-        attribute.add( getPrincipal( call ).getName() );
+        attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
         attribute = new BasicAttribute( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
-        nexus.modify( call.getName(), DirContext.REPLACE_ATTRIBUTE, attributes );
+        nexus.modify( name, DirContext.REPLACE_ATTRIBUTE, attributes );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, ModifyRN call ) throws NamingException
+    public void modifyRn( NextInterceptor nextInterceptor, Name name, String newRn, boolean deleteOldRn ) throws NamingException
     {
-        nextInterceptor.process( call );
+        nextInterceptor.modifyRn( name, newRn, deleteOldRn );
         
         // add operational attributes after call in case the operation fails
         Attributes attributes = new BasicAttributes();
         BasicAttribute attribute = new BasicAttribute( "modifiersName" );
-        attribute.add( getPrincipal( call ).getName() );
+        attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
         attribute = new BasicAttribute( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
-        Name newDn = call.getName().getSuffix( 1 ).add( call.getNewRelativeName() );
+        Name newDn = name.getSuffix( 1 ).add( newRn );
         nexus.modify( newDn, DirContext.REPLACE_ATTRIBUTE, attributes );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Move call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor, Name name, Name newParentName ) throws NamingException
     {
-        nextInterceptor.process( call );
+        nextInterceptor.move( name, newParentName );
 
         // add operational attributes after call in case the operation fails
         Attributes attributes = new BasicAttributes();
         BasicAttribute attribute = new BasicAttribute( "modifiersName" );
-        attribute.add( getPrincipal( call ).getName() );
+        attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
         attribute = new BasicAttribute( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
-        nexus.modify( call.getNewParentName(), DirContext.REPLACE_ATTRIBUTE, attributes );
+        nexus.modify( newParentName, DirContext.REPLACE_ATTRIBUTE, attributes );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, MoveAndModifyRN call ) throws NamingException
+    public void move( NextInterceptor nextInterceptor, Name name, Name newParentName, String newRn, boolean deleteOldRn ) throws NamingException
     {
-        nextInterceptor.process( call );
+        nextInterceptor.move( name, newParentName, newRn, deleteOldRn );
 
         // add operational attributes after call in case the operation fails
         Attributes attributes = new BasicAttributes();
         BasicAttribute attribute = new BasicAttribute( "modifiersName" );
-        attribute.add( getPrincipal( call ).getName() );
+        attribute.add( getPrincipal().getName() );
         attributes.put( attribute );
 
         attribute = new BasicAttribute( "modifyTimestamp" );
         attribute.add( DateUtils.getGeneralizedTime() );
         attributes.put( attribute );
 
-        nexus.modify( call.getNewParentName(), DirContext.REPLACE_ATTRIBUTE, attributes );
+        nexus.modify( newParentName, DirContext.REPLACE_ATTRIBUTE, attributes );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Lookup call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name ) throws NamingException
     {
-        nextInterceptor.process( call );
-
-        Attributes attributes = ( Attributes ) call.getReturnValue();
-        Attributes retval = ( Attributes ) attributes.clone();
-        filter( retval );
-        call.setReturnValue( retval );
+        Attributes result = nextInterceptor.lookup( name );
+        if ( result == null )
+        {
+            return null;
+        }
+        filter( result );
+        return result;
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, LookupWithAttrIds call ) throws NamingException
+    public Attributes lookup( NextInterceptor nextInterceptor, Name name, String[] attrIds ) throws NamingException
     {
-        nextInterceptor.process( call );
-
-        Attributes attributes = ( Attributes ) call.getReturnValue();
-        if ( attributes == null )
+        Attributes result = nextInterceptor.lookup( name, attrIds );
+        if ( result == null )
         {
-            return;
+            return null;
         }
 
-        Attributes retval = ( Attributes ) attributes.clone();
-        filter( call.getName(), retval, call.getAttributeIds() );
-        call.setReturnValue( retval );
+        filter( name, result, attrIds );
+        return result;
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, List call ) throws NamingException
+    public NamingEnumeration list( NextInterceptor nextInterceptor, Name base ) throws NamingException
     {
-        nextInterceptor.process( call );
-
-        NamingEnumeration e;
-        ResultFilteringEnumeration retval;
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        e = ( NamingEnumeration ) call.getReturnValue();
-        retval = new ResultFilteringEnumeration( e, new SearchControls(), ctx, SEARCH_FILTER );
-        call.setReturnValue( retval );
+        NamingEnumeration e = nextInterceptor.list( base );
+        LdapContext ctx =
+            ( LdapContext ) InvocationStack.getInstance().peek().getCaller();
+        return new SearchResultFilteringEnumeration( e, new SearchControls(), ctx, SEARCH_FILTER );
     }
 
 
-    protected void process( NextInterceptor nextInterceptor, Search call ) throws NamingException
+    public NamingEnumeration search( NextInterceptor nextInterceptor, 
+            Name base, Map env, ExprNode filter,
+            SearchControls searchCtls ) throws NamingException
     {
-        nextInterceptor.process( call );
-
-        SearchControls searchControls = call.getControls();
-        if ( searchControls.getReturningAttributes() != null )
+        NamingEnumeration e = nextInterceptor.search( base, env, filter, searchCtls );
+        if ( searchCtls.getReturningAttributes() != null )
         {
-            return;
+            return e;
         }
 
-        NamingEnumeration e;
-        ResultFilteringEnumeration retval;
-        LdapContext ctx = ( LdapContext ) call.getContextStack().peek();
-        e = ( NamingEnumeration ) call.getReturnValue();
-        retval = new ResultFilteringEnumeration( e, searchControls, ctx, SEARCH_FILTER );
-        call.setReturnValue( retval );
+        LdapContext ctx =
+            ( LdapContext ) InvocationStack.getInstance().peek().getCaller();
+        return new SearchResultFilteringEnumeration( e, searchCtls, ctx, SEARCH_FILTER );
     }
 
 

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractContextPartition.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartition.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ContextPartitionNexus.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultContextPartitionNexus.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/Oid.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeContextPartition.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResult.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeSearchResultEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultOptimizer.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DefaultSearchEngine.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DisjunctionEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/DupsEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Enumerator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Evaluator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEnumerator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ExpressionEvaluator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Index.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertion.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexAssertionEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexComparator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexNotFoundException.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexNotFoundException.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/IndexRecord.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/KeyOnlyComparator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/LeafEvaluator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/MasterTable.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/NoDupsEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Optimizer.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEnumerator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/ScopeEvaluator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SearchEngine.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEnumerator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/SubstringEvaluator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Table.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/Tuple.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleBrowser.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleComparator.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleEnumeration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/TupleRenderer.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/ASTNode.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AboutDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AddEntryDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/AttributesTableModel.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/EntryNode.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/FilterDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/IndexDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/MainFrame.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/PartitionViewer.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/SearchResultDialog.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/gui/server.gif
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmContextPartition.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmIndex.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmMasterTable.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTable.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmTupleBrowser.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/package.html
------------------------------------------------------------------------------
    svn:executable = *

Propchange: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/package.html
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/PreferencesUtils.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,11 @@
 package org.apache.ldap.server.prefs;
 
 
-import org.apache.ldap.common.name.LdapName;
-
 import javax.naming.Name;
 import javax.naming.NamingException;
 
+import org.apache.ldap.common.name.LdapName;
+
 
 /**
  * Document this class.
@@ -29,7 +29,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class PreferencesUtils
+class PreferencesUtils
 {
     /** the dn base of the system preference hierarchy */
     static final String SYSPREF_BASE = "prefNodeName=sysPrefRoot,ou=system";

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerPreferencesFactory.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,10 @@
 package org.apache.ldap.server.prefs;
 
 
-import org.apache.ldap.common.NotImplementedException;
-
 import java.util.prefs.Preferences;
 import java.util.prefs.PreferencesFactory;
+
+import org.apache.ldap.common.NotImplementedException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferenceException.java Thu Jun 23 20:08:31 2005
@@ -21,7 +21,7 @@
 
 /**
  * A {@link RuntimeException} that is thrown when accessing
- * {@link org.apache.ldap.server.prefs.ServerSystemPreferences} failed.
+ * {@link ServerSystemPreferences} failed.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/prefs/ServerSystemPreferences.java Thu Jun 23 20:08:31 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
 
 import javax.naming.Context;
 import javax.naming.NameClassPair;
@@ -47,7 +48,7 @@
 
 
 /**
- * A server side system Perferences implementation.  This implementation
+ * A server side system {@link Preferences} implementation.  This implementation
  * presumes the creation of a root system preferences node in advance.  This
  * should be included with the system.ldif that is packaged with the server.
  *

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/AttributeTypeRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.AttributeType;
+import java.util.Iterator;
 
 import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.AttributeType;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,8 +17,9 @@
 package org.apache.ldap.server.schema;
 
 
-import javax.naming.NamingException;
 import java.util.Comparator;
+
+import javax.naming.NamingException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitor.java Thu Jun 23 20:08:31 2005
@@ -17,8 +17,9 @@
 package org.apache.ldap.server.schema;
 
 
-import javax.naming.NamingException;
 import java.util.Comparator;
+
+import javax.naming.NamingException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ComparatorRegistryMonitorAdapter.java Thu Jun 23 20:08:31 2005
@@ -17,8 +17,9 @@
 package org.apache.ldap.server.schema;
 
 
-import javax.naming.NamingException;
 import java.util.Comparator;
+
+import javax.naming.NamingException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/ConcreteNameComponentNormalizer.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,11 @@
 package org.apache.ldap.server.schema;
 
 
+import javax.naming.NamingException;
+
 import org.apache.ldap.common.name.NameComponentNormalizer;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.Normalizer;
-
-import javax.naming.NamingException;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITContentRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.DITContentRule;
+import java.util.Iterator;
 
 import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.DITContentRule;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/DITStructureRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,10 +17,11 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.DITStructureRule;
+import java.util.Iterator;
 
 import javax.naming.NamingException;
-import java.util.Iterator;
+
+import org.apache.ldap.common.schema.DITStructureRule;
 
 
 /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.AttributeType;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
+
 
 /**
  * A plain old java object implementation of an AttributeTypeRegistry.
@@ -46,8 +46,6 @@
     private AttributeTypeRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapAttributeTypeRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -60,11 +58,9 @@
      * the system partition and within the bootstrapping registry to service
      * AttributeType lookup requests.
      *
-     * @param systemPartition the system database partition under ou=system
      * @param bootstrap the bootstrapping registry to delegate to
      */
-    public GlobalAttributeTypeRegistry( SystemPartition systemPartition,
-            BootstrapAttributeTypeRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalAttributeTypeRegistry( BootstrapAttributeTypeRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -80,12 +76,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,14 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
-
-import javax.naming.NamingException;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
+
 
 /**
  * A simple POJO implementation of the ComparatorRegistry service interface.
@@ -42,8 +42,6 @@
     private ComparatorRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapComparatorRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -55,8 +53,7 @@
      * Creates a default ComparatorRegistry by initializing the map and the
      * montior.
      */
-    public GlobalComparatorRegistry( SystemPartition systemPartition,
-            BootstrapComparatorRegistry bootstrap )
+    public GlobalComparatorRegistry( BootstrapComparatorRegistry bootstrap )
     {
         this.oidToSchema = new HashMap();
         this.comparators = new HashMap();
@@ -69,12 +66,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.DITContentRule;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.DITContentRule;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
+
 
 /**
  * A plain old java object implementation of an DITContentRuleRegistry.
@@ -46,8 +46,6 @@
     private DITContentRuleRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapDitContentRuleRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapDitContentRuleRegistry.
      */
-    public GlobalDitContentRuleRegistry( SystemPartition systemPartition,
-            BootstrapDitContentRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalDitContentRuleRegistry( BootstrapDitContentRuleRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.DITStructureRule;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.DITStructureRule;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
+
 
 /**
  * A plain old java object implementation of an DITStructureRuleRegistry.
@@ -46,8 +46,6 @@
     private DITStructureRuleRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapDitStructureRuleRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapDitStructureRuleRegistry.
      */
-    public GlobalDitStructureRuleRegistry( SystemPartition systemPartition,
-            BootstrapDitStructureRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalDitStructureRuleRegistry( BootstrapDitStructureRuleRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRule;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
+
 
 /**
  * A plain old java object implementation of an MatchingRuleRegistry.
@@ -46,8 +46,6 @@
     private MatchingRuleRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapMatchingRuleRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapMatchingRuleRegistry.
      */
-    public GlobalMatchingRuleRegistry( SystemPartition systemPartition,
-            BootstrapMatchingRuleRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalMatchingRuleRegistry( BootstrapMatchingRuleRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.MatchingRuleUse;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.MatchingRuleUse;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
+
 
 /**
  * A plain old java object implementation of an MatchingRuleUseRegistry.
@@ -46,8 +46,6 @@
     private MatchingRuleUseRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapMatchingRuleUseRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapMatchingRuleUseRegistry.
      */
-    public GlobalMatchingRuleUseRegistry( SystemPartition systemPartition,
-            BootstrapMatchingRuleUseRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalMatchingRuleUseRegistry( BootstrapMatchingRuleUseRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.NameForm;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.NameForm;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
+
 
 /**
  * A plain old java object implementation of an NameFormRegistry.
@@ -46,8 +46,6 @@
     private NameFormRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapNameFormRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapNameFormRegistry.
      */
-    public GlobalNameFormRegistry( SystemPartition systemPartition,
-            BootstrapNameFormRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalNameFormRegistry( BootstrapNameFormRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,14 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.Normalizer;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.Normalizer;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
+
 
 /**
  * A simple POJO implementation of the NormalizerRegistry service interface.
@@ -42,8 +42,6 @@
     private NormalizerRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapNormalizerRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -55,8 +53,7 @@
      * Creates a default NormalizerRegistry by initializing the map and the
      * montior.
      */
-    public GlobalNormalizerRegistry( SystemPartition systemPartition,
-            BootstrapNormalizerRegistry bootstrap )
+    public GlobalNormalizerRegistry( BootstrapNormalizerRegistry bootstrap )
     {
         this.oidToSchema = new HashMap();
         this.normalizers = new HashMap();
@@ -66,12 +63,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,16 +17,16 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.ObjectClass;
-import org.apache.ldap.common.util.JoinIterator;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.ObjectClass;
+import org.apache.ldap.common.util.JoinIterator;
+import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
+
 
 /**
  * A plain old java object implementation of an ObjectClassRegistry.
@@ -46,8 +46,6 @@
     private ObjectClassRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapObjectClassRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -58,8 +56,7 @@
     /**
      * Creates an empty BootstrapObjectClassRegistry.
      */
-    public GlobalObjectClassRegistry( SystemPartition systemPartition,
-            BootstrapObjectClassRegistry bootstrap, OidRegistry oidRegistry )
+    public GlobalObjectClassRegistry( BootstrapObjectClassRegistry bootstrap, OidRegistry oidRegistry )
     {
         this.byOid = new HashMap();
         this.oidToSchema = new HashMap();
@@ -70,12 +67,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalOidRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,11 +17,15 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.naming.NamingException;
-import java.util.*;
+
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
 
 
 /**
@@ -45,9 +49,6 @@
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapOidRegistry bootstrap;
 
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
-
 
     // ------------------------------------------------------------------------
     // C O N S T R U C T O R S
@@ -57,21 +58,13 @@
     /**
      * Creates a default OidRegistry by initializing the map and the montior.
      */
-    public GlobalOidRegistry( SystemPartition systemPartition,
-            BootstrapOidRegistry bootstrap )
+    public GlobalOidRegistry( BootstrapOidRegistry bootstrap )
     {
         this.bootstrap = bootstrap;
 
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalRegistries.java Thu Jun 23 20:08:31 2005
@@ -17,17 +17,29 @@
 package org.apache.ldap.server.schema;
 
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.naming.NamingException;
+
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.MatchingRule;
 import org.apache.ldap.common.schema.ObjectClass;
 import org.apache.ldap.common.schema.Syntax;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.*;
-
-import javax.naming.NamingException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.ldap.server.schema.bootstrap.BootstrapAttributeTypeRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapComparatorRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitContentRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapDitStructureRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapMatchingRuleUseRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNameFormRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapNormalizerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapObjectClassRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapRegistries;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxRegistry;
 
 
 /**
@@ -52,39 +64,38 @@
     private GlobalSyntaxRegistry syntaxRegistry;
 
 
-    public GlobalRegistries( SystemPartition systemPartition,
-                             BootstrapRegistries bootstrapRegistries )
+    public GlobalRegistries( BootstrapRegistries bootstrapRegistries )
     {
-        oidRegistry = new GlobalOidRegistry( systemPartition,
+        oidRegistry = new GlobalOidRegistry(
                 ( BootstrapOidRegistry ) bootstrapRegistries.getOidRegistry() );
-        normalizerRegistry = new GlobalNormalizerRegistry( systemPartition,
+        normalizerRegistry = new GlobalNormalizerRegistry(
                 ( BootstrapNormalizerRegistry ) bootstrapRegistries.getNormalizerRegistry());
-        comparatorRegistry = new GlobalComparatorRegistry( systemPartition,
+        comparatorRegistry = new GlobalComparatorRegistry(
                 ( BootstrapComparatorRegistry ) bootstrapRegistries.getComparatorRegistry());
-        syntaxCheckerRegistry = new GlobalSyntaxCheckerRegistry( systemPartition,
+        syntaxCheckerRegistry = new GlobalSyntaxCheckerRegistry(
                 ( BootstrapSyntaxCheckerRegistry ) bootstrapRegistries.getSyntaxCheckerRegistry());
-        syntaxRegistry = new GlobalSyntaxRegistry( systemPartition,
+        syntaxRegistry = new GlobalSyntaxRegistry(
                 ( BootstrapSyntaxRegistry ) bootstrapRegistries.getSyntaxRegistry(),
                 oidRegistry );
-        matchingRuleRegistry = new GlobalMatchingRuleRegistry( systemPartition,
+        matchingRuleRegistry = new GlobalMatchingRuleRegistry(
                 ( BootstrapMatchingRuleRegistry ) bootstrapRegistries.getMatchingRuleRegistry(),
                 oidRegistry );
-        attributeTypeRegistry = new GlobalAttributeTypeRegistry( systemPartition,
+        attributeTypeRegistry = new GlobalAttributeTypeRegistry(
                 ( BootstrapAttributeTypeRegistry ) bootstrapRegistries.getAttributeTypeRegistry(),
                 oidRegistry );
-        objectClassRegistry = new GlobalObjectClassRegistry( systemPartition,
+        objectClassRegistry = new GlobalObjectClassRegistry(
                 ( BootstrapObjectClassRegistry ) bootstrapRegistries.getObjectClassRegistry(),
                 oidRegistry );
-        ditContentRuleRegistry = new GlobalDitContentRuleRegistry( systemPartition,
+        ditContentRuleRegistry = new GlobalDitContentRuleRegistry(
                 ( BootstrapDitContentRuleRegistry ) bootstrapRegistries.getDitContentRuleRegistry(),
                 oidRegistry );
-        ditStructureRuleRegistry = new GlobalDitStructureRuleRegistry( systemPartition,
+        ditStructureRuleRegistry = new GlobalDitStructureRuleRegistry(
                 ( BootstrapDitStructureRuleRegistry ) bootstrapRegistries.getDitStructureRuleRegistry(),
                 oidRegistry );
-        matchingRuleUseRegistry = new GlobalMatchingRuleUseRegistry( systemPartition,
+        matchingRuleUseRegistry = new GlobalMatchingRuleUseRegistry(
                 ( BootstrapMatchingRuleUseRegistry ) bootstrapRegistries.getMatchingRuleUseRegistry(),
                 oidRegistry );
-        nameFormRegistry = new GlobalNameFormRegistry( systemPartition,
+        nameFormRegistry = new GlobalNameFormRegistry(
                 ( BootstrapNameFormRegistry ) bootstrapRegistries.getNameFormRegistry(),
                 oidRegistry );
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java?rev=201550&r1=201549&r2=201550&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/GlobalSyntaxCheckerRegistry.java Thu Jun 23 20:08:31 2005
@@ -17,14 +17,14 @@
 package org.apache.ldap.server.schema;
 
 
-import org.apache.ldap.common.schema.SyntaxChecker;
-import org.apache.ldap.server.SystemPartition;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
-
-import javax.naming.NamingException;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.naming.NamingException;
+
+import org.apache.ldap.common.schema.SyntaxChecker;
+import org.apache.ldap.server.schema.bootstrap.BootstrapSyntaxCheckerRegistry;
+
 
 /**
  * A simple POJO implementation of the SyntaxCheckerRegistry service interface.
@@ -42,8 +42,6 @@
     private SyntaxCheckerRegistryMonitor monitor;
     /** the underlying bootstrap registry to delegate on misses to */
     private BootstrapSyntaxCheckerRegistry bootstrap;
-    /** the system partition where we keep attributeType updates */
-    private SystemPartition systemPartition;
 
 
     // ------------------------------------------------------------------------
@@ -55,8 +53,7 @@
      * Creates a default SyntaxCheckerRegistry by initializing the map and the
      * montior.
      */
-    public GlobalSyntaxCheckerRegistry( SystemPartition systemPartition,
-            BootstrapSyntaxCheckerRegistry bootstrap )
+    public GlobalSyntaxCheckerRegistry( BootstrapSyntaxCheckerRegistry bootstrap )
     {
         this.oidToSchema = new HashMap();
         this.syntaxCheckers = new HashMap();
@@ -66,12 +63,6 @@
         if ( this.bootstrap == null )
         {
             throw new NullPointerException( "the bootstrap registry cannot be null" ) ;
-        }
-
-        this.systemPartition = systemPartition;
-        if ( this.systemPartition == null )
-        {
-            throw new NullPointerException( "the system partition cannot be null" ) ;
         }
     }
 



Mime
View raw message