directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r307234 - in /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server: ./ authn/ authz/ collective/ configuration/ event/ exception/ interceptor/ jndi/ normalization/ operational/ partition/ partition/impl/btree/ partition/impl/b...
Date Sat, 08 Oct 2005 01:44:00 GMT
Author: trustin
Date: Fri Oct  7 18:43:33 2005
New Revision: 307234

URL: http://svn.apache.org/viewcvs?rev=307234&view=rev
Log:
Renamed ContextFactoryService and its related classes to DirectoryService

Added:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
      - copied, changed from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java
      - copied, changed from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryService.java
      - copied, changed from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java
      - copied, changed from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java
      - copied, changed from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java
Removed:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java
Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/normalization/NormalizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/operational/OperationalAttributeService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java (from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java&r1=307233&r2=307234&rev=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java Fri Oct  7 18:43:33 2005
@@ -55,20 +55,20 @@
 
 
 /**
- * Default implementation of {@link ContextFactoryService}.
+ * Default implementation of {@link DirectoryService}.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-class DefaultContextFactoryService extends ContextFactoryService
+class DefaultDirectoryService extends DirectoryService
 {
-    private static final Logger log = LoggerFactory.getLogger( DefaultContextFactoryService.class );
+    private static final Logger log = LoggerFactory.getLogger( DefaultDirectoryService.class );
 
     private final String instanceId;
 
-    private final ContextFactoryConfiguration configuration = new DefaultContextFactoryConfiguration( this );
+    private final DirectoryServiceConfiguration configuration = new DefaultDirectoryServiceConfiguration( this );
 
-    private ContextFactoryServiceListener serviceListener;
+    private DirectoryServiceListener serviceListener;
     
     /** the initial context environment that fired up the backend subsystem */
     private Hashtable environment;
@@ -99,7 +99,7 @@
     /**
      * Creates a new instance.
      */
-    public DefaultContextFactoryService( String instanceId )
+    public DefaultDirectoryService( String instanceId )
     {
         if( instanceId == null )
         {
@@ -120,7 +120,7 @@
                 {
                     log.warn(
                             "Failed to shut down ContextFactoryService: " +
-                            DefaultContextFactoryService.this.instanceId, e );
+                            DefaultDirectoryService.this.instanceId, e );
                 }
             }
         }, "ApacheDS Shutdown Hook (" + instanceId + ')' ) );
@@ -173,7 +173,7 @@
         return new ServerLdapContext( this, environment );
     }
 
-    public synchronized void startup( ContextFactoryServiceListener listener, Hashtable env ) throws NamingException
+    public synchronized void startup( DirectoryServiceListener listener, Hashtable env ) throws NamingException
     {
         Hashtable envCopy = ( Hashtable ) env.clone();
 
@@ -257,7 +257,7 @@
         return instanceId;
     }
     
-    public ContextFactoryConfiguration getConfiguration()
+    public DirectoryServiceConfiguration getConfiguration()
     {
         return configuration;
     }
@@ -268,7 +268,7 @@
         return ( Hashtable ) environment.clone();
     }
     
-    public ContextFactoryServiceListener getServiceListener()
+    public DirectoryServiceListener getServiceListener()
     {
         return serviceListener;
     }

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java (from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java&r1=307233&r2=307234&rev=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryServiceConfiguration.java Fri Oct  7 18:43:33 2005
@@ -28,16 +28,16 @@
 
 
 /**
- * Default implementation of {@link ContextFactoryConfiguration}.
+ * Default implementation of {@link DirectoryServiceConfiguration}.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-class DefaultContextFactoryConfiguration implements ContextFactoryConfiguration
+class DefaultDirectoryServiceConfiguration implements DirectoryServiceConfiguration
 {
-    private DefaultContextFactoryService parent;
+    private DefaultDirectoryService parent;
     
-    DefaultContextFactoryConfiguration( DefaultContextFactoryService parent )
+    DefaultDirectoryServiceConfiguration( DefaultDirectoryService parent )
     {
         this.parent = parent;
     }
@@ -47,12 +47,12 @@
         return parent.getInstanceId();
     }
     
-    public ContextFactoryService getService()
+    public DirectoryService getService()
     {
         return parent;
     }
 
-    public ContextFactoryServiceListener getServiceListener()
+    public DirectoryServiceListener getServiceListener()
     {
         return parent.getServiceListener();
     }

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryService.java (from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryService.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryService.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java&r1=307233&r2=307234&rev=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryService.java Fri Oct  7 18:43:33 2005
@@ -36,7 +36,7 @@
  * @author The Apache Directory Project
  * @version $Rev$, $Date$
  */
-public abstract class ContextFactoryService
+public abstract class DirectoryService
 {
     private static final Map instances = new HashMap();
 
@@ -44,21 +44,21 @@
      * Returns the default instance.  This method is identical with calling
      * <tt>getInstance( Configuration.DEFAULT_INSTANCE_ID )</tt>.
      */
-    public static ContextFactoryService getInstance()
+    public static DirectoryService getInstance()
     {
         return getInstance( Configuration.DEFAULT_INSTANCE_ID );
     }
     
     /**
-     * Returns {@link ContextFactoryService} with the specified instance ID.
+     * Returns {@link DirectoryService} with the specified instance ID.
      */
-    public synchronized static ContextFactoryService getInstance( String instanceId )
+    public synchronized static DirectoryService getInstance( String instanceId )
     {
         instanceId = instanceId.trim();
-        ContextFactoryService service = ( ContextFactoryService ) instances.get( instanceId );
+        DirectoryService service = ( DirectoryService ) instances.get( instanceId );
         if( service == null )
         {
-            service = new DefaultContextFactoryService( instanceId );
+            service = new DefaultDirectoryService( instanceId );
             instances.put( instanceId, service );
         }
         
@@ -66,7 +66,7 @@
     }
     
     /**
-     * Returns all instances of instantiated {@link ContextFactoryService}.
+     * Returns all instances of instantiated {@link DirectoryService}.
      */
     public synchronized static Set getAllInstances()
     {
@@ -81,7 +81,7 @@
      * 
      * @throws NamingException if failed to start up
      */
-    public abstract void startup( ContextFactoryServiceListener listener, Hashtable environment ) throws NamingException;
+    public abstract void startup( DirectoryServiceListener listener, Hashtable environment ) throws NamingException;
     
     /**
      * Shuts down this service.
@@ -104,7 +104,7 @@
     /**
      * Returns the configuration of this service.
      */
-    public abstract ContextFactoryConfiguration getConfiguration();
+    public abstract DirectoryServiceConfiguration getConfiguration();
 
     /**
      * Returns an anonymous JNDI {@link Context} with the specified <tt>baseName</tt>

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java (from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java&r1=307233&r2=307234&rev=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceConfiguration.java Fri Oct  7 18:43:33 2005
@@ -27,51 +27,51 @@
 
 /**
  * Represents the global configuration of currently running
- * {@link ContextFactoryService}.  You can access all properties of
- * {@link ContextFactoryService} and get JNDI {@link Context}s it provides
+ * {@link DirectoryService}.  You can access all properties of
+ * {@link DirectoryService} and get JNDI {@link Context}s it provides
  * via this interface.
  */
-public interface ContextFactoryConfiguration
+public interface DirectoryServiceConfiguration
 {
     
     /**
-     * Returns the {@link ContextFactoryService} for this configuration.
+     * Returns the {@link DirectoryService} for this configuration.
      */
-    ContextFactoryService getService();
+    DirectoryService getService();
     
     /**
-     * Returns the instance ID of the {@link ContextFactoryService}.
+     * Returns the instance ID of the {@link DirectoryService}.
      */
     String getInstanceId();
     
     /**
      * Returns the listener that listens to service events.
      */
-    ContextFactoryServiceListener getServiceListener();
+    DirectoryServiceListener getServiceListener();
     
     /**
-     * Returns the initial context environment of the {@link ContextFactoryService}.
+     * Returns the initial context environment of the {@link DirectoryService}.
      */
     Hashtable getEnvironment();
     
     /**
-     * Returns the startup configuration of the {@link ContextFactoryService}.
+     * Returns the startup configuration of the {@link DirectoryService}.
      */
     StartupConfiguration getStartupConfiguration();
     
     /**
-     * Returns the registries for system schema objects of the {@link ContextFactoryService}.
+     * Returns the registries for system schema objects of the {@link DirectoryService}.
      */
     GlobalRegistries getGlobalRegistries();
 
     /**
-     * Returns the {@link DirectoryPartitionNexus} of the {@link ContextFactoryService}
+     * Returns the {@link DirectoryPartitionNexus} of the {@link DirectoryService}
      * which bypasses the interceptor chain.
      */
     DirectoryPartitionNexus getPartitionNexus();
     
     /**
-     * Returns the interceptor chain of the {@link ContextFactoryService}.
+     * Returns the interceptor chain of the {@link DirectoryService}.
      */
     InterceptorChain getInterceptorChain();
     

Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java (from r307233, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java&r1=307233&r2=307234&rev=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/ContextFactoryServiceListener.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DirectoryServiceListener.java Fri Oct  7 18:43:33 2005
@@ -20,35 +20,35 @@
 
 /**
  * An event handler that listens to the changes occurs to
- * {@link ContextFactoryService}.
+ * {@link DirectoryService}.
  * 
  * @author The Apache Directory Project
  * @version $Rev$, $Date$
  */
-public interface ContextFactoryServiceListener
+public interface DirectoryServiceListener
 {
     /**
-     * Invoked before starting up {@link ContextFactoryService}.
+     * Invoked before starting up {@link DirectoryService}.
      */
-    void beforeStartup( ContextFactoryService service ) throws NamingException;
+    void beforeStartup( DirectoryService service ) throws NamingException;
     /**
-     * Invoked after starting up {@link ContextFactoryService}.
+     * Invoked after starting up {@link DirectoryService}.
      */
-    void afterStartup( ContextFactoryService service ) throws NamingException;
+    void afterStartup( DirectoryService service ) throws NamingException;
     /**
-     * Invoked before shutting down {@link ContextFactoryService}.
+     * Invoked before shutting down {@link DirectoryService}.
      */
-    void beforeShutdown( ContextFactoryService service ) throws NamingException;
+    void beforeShutdown( DirectoryService service ) throws NamingException;
     /**
-     * Invoked after shutting down {@link ContextFactoryService}.
+     * Invoked after shutting down {@link DirectoryService}.
      */
-    void afterShutdown( ContextFactoryService service ) throws NamingException;
+    void afterShutdown( DirectoryService service ) throws NamingException;
     /**
-     * Invoked before calling {@link ContextFactoryService#sync()}.
+     * Invoked before calling {@link DirectoryService#sync()}.
      */
-    void beforeSync( ContextFactoryService service ) throws NamingException;
+    void beforeSync( DirectoryService service ) throws NamingException;
     /**
-     * Invoked after calling {@link ContextFactoryService#sync()}.
+     * Invoked after calling {@link DirectoryService#sync()}.
      */
-    void afterSync( ContextFactoryService service ) throws NamingException;
+    void afterSync( DirectoryService service ) throws NamingException;
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AbstractAuthenticator.java Fri Oct  7 18:43:33 2005
@@ -20,7 +20,7 @@
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
 import org.apache.ldap.server.jndi.ServerContext;
 
@@ -33,7 +33,7 @@
  */
 public abstract class AbstractAuthenticator implements Authenticator
 {
-    private ContextFactoryConfiguration factoryCfg;
+    private DirectoryServiceConfiguration factoryCfg;
     private AuthenticatorConfiguration cfg;
 
     /** authenticator type */
@@ -52,10 +52,10 @@
 
 
     /**
-     * Returns {@link ContextFactoryConfiguration} of {@link InitialContextFactory}
+     * Returns {@link DirectoryServiceConfiguration} of {@link InitialContextFactory}
      * which initialized this authenticator.
      */
-    public ContextFactoryConfiguration getFactoryConfiguration()
+    public DirectoryServiceConfiguration getFactoryConfiguration()
     {
         return factoryCfg;
     }
@@ -79,7 +79,7 @@
      * <tt>configuration</tt>, and calls {@link #doInit()} method.
      * Please put your initialization code into {@link #doInit()}.
      */
-    public final void init( ContextFactoryConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException
+    public final void init( DirectoryServiceConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException
     {
         this.factoryCfg = factoryCfg;
         this.cfg = cfg;

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/AuthenticationService.java Fri Oct  7 18:43:33 2005
@@ -36,7 +36,7 @@
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.message.ResultCodeEnum;
 import org.apache.ldap.common.util.StringTools;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
@@ -63,7 +63,7 @@
     /** authenticators **/
     public Map authenticators = new HashMap();
 
-    private ContextFactoryConfiguration factoryCfg;
+    private DirectoryServiceConfiguration factoryCfg;
 
     /**
      * Creates an authentication service interceptor.
@@ -75,7 +75,7 @@
     /**
      * Registers and initializes all {@link Authenticator}s to this service.
      */
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         this.factoryCfg = factoryCfg;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authn/Authenticator.java Fri Oct  7 18:43:33 2005
@@ -20,7 +20,7 @@
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.AuthenticatorConfiguration;
 import org.apache.ldap.server.jndi.ServerContext;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
@@ -54,7 +54,7 @@
      * Called by {@link AuthenticationService} to indicate that this
      * authenticator is being placed into service.
      */
-    public void init( ContextFactoryConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException;
+    public void init( DirectoryServiceConfiguration factoryCfg, AuthenticatorConfiguration cfg ) throws NamingException;
     
     /**
      * Called by {@link AuthenticationService} to indicate that this

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/AuthorizationService.java Fri Oct  7 18:43:33 2005
@@ -17,7 +17,7 @@
 package org.apache.ldap.server.authz;
 
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.interceptor.InterceptorChain;
@@ -137,7 +137,7 @@
      * @param cfg the interceptor configuration
      * @throws NamingException if there are problems during initialization
      */
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         super.init( factoryCfg, cfg );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/GroupCache.java Fri Oct  7 18:43:33 2005
@@ -21,7 +21,7 @@
 import org.apache.ldap.common.name.LdapName;
 import org.apache.ldap.common.filter.SimpleNode;
 import org.apache.ldap.common.filter.BranchNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 import org.slf4j.Logger;
@@ -70,7 +70,7 @@
      *
      * @param factoryCfg the context factory configuration for the server
      */
-    public GroupCache( ContextFactoryConfiguration factoryCfg ) throws NamingException
+    public GroupCache( DirectoryServiceConfiguration factoryCfg ) throws NamingException
     {
         this.nexus = factoryCfg.getPartitionNexus();
         this.env = ( Hashtable ) factoryCfg.getEnvironment().clone();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/OldAuthorizationService.java Fri Oct  7 18:43:33 2005
@@ -32,7 +32,7 @@
 import org.apache.ldap.common.exception.LdapNoPermissionException;
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.DnParser;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
@@ -86,7 +86,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         AttributeTypeRegistry atr = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         dnParser = new DnParser( new ConcreteNameComponentNormalizer( atr ) );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/authz/TupleCache.java Fri Oct  7 18:43:33 2005
@@ -37,7 +37,7 @@
 import org.apache.ldap.common.filter.SimpleNode;
 import org.apache.ldap.common.message.ResultCodeEnum;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 import org.apache.ldap.server.schema.ConcreteNameComponentNormalizer;
 import org.slf4j.Logger;
@@ -79,7 +79,7 @@
      *
      * @param factoryCfg the context factory configuration for the server
      */
-    public TupleCache( ContextFactoryConfiguration factoryCfg ) throws NamingException
+    public TupleCache( DirectoryServiceConfiguration factoryCfg ) throws NamingException
     {
         this.nexus = factoryCfg.getPartitionNexus();
         aciParser = new ACIItemParser( new ConcreteNameComponentNormalizer(

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/collective/CollectiveAttributeService.java Fri Oct  7 18:43:33 2005
@@ -17,7 +17,7 @@
 package org.apache.ldap.server.collective;
 
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
@@ -74,7 +74,7 @@
     private DirectoryPartitionNexus nexus = null;
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         super.init( factoryCfg, cfg );
         nexus = factoryCfg.getPartitionNexus();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/AttributesPropertyEditor.java Fri Oct  7 18:43:33 2005
@@ -36,12 +36,12 @@
 import org.apache.ldap.common.ldif.LdifParser;
 import org.apache.ldap.common.ldif.LdifParserImpl;
 import org.apache.ldap.common.util.MultiMap;
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 /**
  * A JavaBeans {@link PropertyEditor} that can convert {@link Attributes}
  * to LDIF string and vice versa.  This class is useful when you're going
- * to configure a {@link ContextFactoryService} with 3rd party containers
+ * to configure a {@link DirectoryService} with 3rd party containers
  * such as <a href="http://www.springframework.org/">Spring Framework</a>.
  *
  * @author The Apache Directory Project

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java Fri Oct  7 18:43:33 2005
@@ -21,11 +21,11 @@
 import java.io.Serializable;
 import java.util.Hashtable;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 /**
  * A configuration that provides required, optional, or default properties
- * to configure {@link ContextFactoryService}.
+ * to configure {@link DirectoryService}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -38,7 +38,7 @@
     public static final String JNDI_KEY = Configuration.class.getName();
     
     /**
-     * The default ID of {@link ContextFactoryService} that is used
+     * The default ID of {@link DirectoryService} that is used
      * when no instance ID is specified. 
      */
     public static final String DEFAULT_INSTANCE_ID = "default";
@@ -71,7 +71,7 @@
     }
     
     /**
-     * Returns the ID of {@link ContextFactoryService} instance to configure.
+     * Returns the ID of {@link DirectoryService} instance to configure.
      */
     public String getInstanceId()
     {
@@ -79,7 +79,7 @@
     }
     
     /**
-     * Sets the ID of {@link ContextFactoryService} instance to configure.
+     * Sets the ID of {@link DirectoryService} instance to configure.
      */
     protected void setInstanceId( String instanceId )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/MutableStartupConfiguration.java Fri Oct  7 18:43:33 2005
@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 /**
  * A mutable version of {@link StartupConfiguration}.
@@ -42,7 +42,7 @@
     }
     
     /**
-     * Creates a new instance that operates on the {@link ContextFactoryService}
+     * Creates a new instance that operates on the {@link DirectoryService}
      * with the specified ID.
      */
     public MutableStartupConfiguration( String instanceId )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java Fri Oct  7 18:43:33 2005
@@ -18,7 +18,7 @@
  */
 package org.apache.ldap.server.configuration;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 /**
  * A {@link Configuration} that shuts down ApacheDS.
@@ -38,7 +38,7 @@
     }
 
     /**
-     * Creates a new instance that operates on the {@link ContextFactoryService}
+     * Creates a new instance that operates on the {@link DirectoryService}
      * with the specified ID.
      */
     public ShutdownConfiguration( String instanceId )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java Fri Oct  7 18:43:33 2005
@@ -27,7 +27,7 @@
 
 import javax.naming.directory.Attributes;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.authn.AnonymousAuthenticator;
 import org.apache.ldap.server.authn.AuthenticationService;
 import org.apache.ldap.server.authn.SimpleAuthenticator;
@@ -74,7 +74,7 @@
 
     /**
      * Creates a new instance with default settings that operates on the
-     * {@link ContextFactoryService} with the specified ID.
+     * {@link DirectoryService} with the specified ID.
      */
     public StartupConfiguration( String instanceId )
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java Fri Oct  7 18:43:33 2005
@@ -18,10 +18,10 @@
  */
 package org.apache.ldap.server.configuration;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 /**
- * A {@link Configuration} that makes a call to {@link ContextFactoryService#sync()}.
+ * A {@link Configuration} that makes a call to {@link DirectoryService#sync()}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -38,7 +38,7 @@
     }
     
     /**
-     * Creates a new instance that operates on the {@link ContextFactoryService}
+     * Creates a new instance that operates on the {@link DirectoryService}
      * with the specified ID.
      */
     public SyncConfiguration( String instanceId )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/event/EventService.java Fri Oct  7 18:43:33 2005
@@ -17,7 +17,7 @@
 package org.apache.ldap.server.event;
 
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
@@ -53,7 +53,7 @@
     private Evaluator evaluator = null;
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         super.init( factoryCfg, cfg );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/exception/ExceptionService.java Fri Oct  7 18:43:33 2005
@@ -28,7 +28,7 @@
 import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.message.ResultCodeEnum;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -57,7 +57,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg )
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg )
     {
         nexus = factoryCfg.getPartitionNexus();
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/BaseInterceptor.java Fri Oct  7 18:43:33 2005
@@ -30,7 +30,7 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.authn.LdapPrincipal;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
@@ -77,7 +77,7 @@
     /**
      * This method does nothing by default.
      */
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/Interceptor.java Fri Oct  7 18:43:33 2005
@@ -28,7 +28,7 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.partition.DirectoryPartition;
@@ -104,7 +104,7 @@
      * Intializes this interceptor.  This is invoked by {@link InterceptorChain}
      * when this intercepter is loaded into interceptor chain.
      */
-    void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException;
+    void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException;
 
     /**
      * Deinitializes this interceptor.  This is invoked by {@link InterceptorChain}

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/interceptor/InterceptorChain.java Fri Oct  7 18:43:33 2005
@@ -33,7 +33,7 @@
 import javax.naming.directory.SearchControls;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.configuration.MutableInterceptorConfiguration;
@@ -56,7 +56,7 @@
     {
         private DirectoryPartitionNexus nexus;
 
-        public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg )
+        public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg )
         {
             this.nexus = factoryCfg.getPartitionNexus();
         }
@@ -194,7 +194,7 @@
 
     private Entry head;
 
-    private ContextFactoryConfiguration factoryCfg;
+    private DirectoryServiceConfiguration factoryCfg;
 
     /**
      * Create a new interceptor chain.
@@ -211,9 +211,9 @@
 
     /**
      * Initializes and registers all interceptors according to the specified
-     * {@link ContextFactoryConfiguration}.
+     * {@link DirectoryServiceConfiguration}.
      */
-    public synchronized void init( ContextFactoryConfiguration factoryCfg ) throws NamingException
+    public synchronized void init( DirectoryServiceConfiguration factoryCfg ) throws NamingException
     {
         this.factoryCfg = factoryCfg;
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java Fri Oct  7 18:43:33 2005
@@ -25,8 +25,8 @@
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.ldap.server.ContextFactoryService;
-import org.apache.ldap.server.ContextFactoryServiceListener;
+import org.apache.ldap.server.DirectoryService;
+import org.apache.ldap.server.DirectoryServiceListener;
 import org.apache.ldap.server.configuration.AddDirectoryPartitionConfiguration;
 import org.apache.ldap.server.configuration.Configuration;
 import org.apache.ldap.server.configuration.RemoveDirectoryPartitionConfiguration;
@@ -51,12 +51,12 @@
  * Unfortunately, {@link InitialContext} creates a new instance of
  * {@link InitialContextFactory} implementation everytime it is instantiated,
  * so this factory maintains only a static, singleton instance of
- * {@link ContextFactoryService}, which provides actual implementation.
+ * {@link DirectoryService}, which provides actual implementation.
  * Please note that you'll also have to maintain any stateful information
  * as using singleton pattern if you're going to extend this factory.
  * <p>
- * This class implements {@link ContextFactoryServiceListener}.  This means that
- * you can listen to the changes occurs to {@link ContextFactoryService}, and
+ * This class implements {@link DirectoryServiceListener}.  This means that
+ * you can listen to the changes occurs to {@link DirectoryService}, and
  * react to it (e.g. executing additional business logic).
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -64,7 +64,7 @@
  * 
  * @see javax.naming.spi.InitialContextFactory
  */
-public abstract class AbstractContextFactory implements InitialContextFactory, ContextFactoryServiceListener
+public abstract class AbstractContextFactory implements InitialContextFactory, DirectoryServiceListener
 {
     // ------------------------------------------------------------------------
     // Members
@@ -86,7 +86,7 @@
         String authentication = getAuthentication( env );
         String providerUrl = getProviderUrl( env );
 
-        ContextFactoryService service = ContextFactoryService.getInstance( cfg.getInstanceId() );
+        DirectoryService service = DirectoryService.getInstance( cfg.getInstanceId() );
 
         // Execute configuration
         if( cfg instanceof ShutdownConfiguration )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java Fri Oct  7 18:43:33 2005
@@ -19,7 +19,7 @@
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 
 /**
@@ -42,42 +42,42 @@
     /**
      * Does nothing by default.
      */
-    public void beforeStartup( ContextFactoryService service ) throws NamingException
+    public void beforeStartup( DirectoryService service ) throws NamingException
     {
     }
 
     /**
      * Does nothing by default.
      */
-    public void afterStartup( ContextFactoryService service ) throws NamingException
+    public void afterStartup( DirectoryService service ) throws NamingException
     {
     }
     
     /**
      * Does nothing by default.
      */
-    public void beforeShutdown( ContextFactoryService service ) throws NamingException
+    public void beforeShutdown( DirectoryService service ) throws NamingException
     {
     }
     
     /**
      * Does nothing by default.
      */
-    public void afterShutdown( ContextFactoryService service ) throws NamingException
+    public void afterShutdown( DirectoryService service ) throws NamingException
     {
     }
     
     /**
      * Does nothing by default.
      */
-    public void beforeSync( ContextFactoryService service ) throws NamingException
+    public void beforeSync( DirectoryService service ) throws NamingException
     {
     }
 
     /**
      * Does nothing by default.
      */
-    public void afterSync( ContextFactoryService service ) throws NamingException
+    public void afterSync( DirectoryService service ) throws NamingException
     {
     }
 }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Fri Oct  7 18:43:33 2005
@@ -49,8 +49,8 @@
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.name.LdapName;
 import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.ContextFactoryConfiguration;
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.authn.AuthenticationService;
 import org.apache.ldap.server.authn.LdapPrincipal;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
@@ -102,12 +102,12 @@
      * @throws NamingException if the environment parameters are not set 
      * correctly.
      */
-    protected ServerContext( ContextFactoryService service, Hashtable env ) throws NamingException
+    protected ServerContext( DirectoryService service, Hashtable env ) throws NamingException
     {
         // set references to cloned env and the proxy
         this.nexusProxy = new DirectoryPartitionNexusProxy( this, service );
         
-        ContextFactoryConfiguration cfg = service.getConfiguration();
+        DirectoryServiceConfiguration cfg = service.getConfiguration();
         
         this.env = ( Hashtable ) cfg.getEnvironment().clone();
         this.env.putAll( env );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java Fri Oct  7 18:43:33 2005
@@ -46,7 +46,7 @@
 import org.apache.ldap.common.filter.SimpleNode;
 import org.apache.ldap.common.name.LdapName;
 import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.authn.LdapPrincipal;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 import org.apache.ldap.server.partition.DirectoryPartitionNexusProxy;
@@ -73,7 +73,7 @@
      * @param env the environment used for this context
      * @throws NamingException if something goes wrong
      */
-    public ServerDirContext( ContextFactoryService service, Hashtable env ) throws NamingException
+    public ServerDirContext( DirectoryService service, Hashtable env ) throws NamingException
     {
         super( service, env );
     }

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=307234&r1=307233&r2=307234&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 Fri Oct  7 18:43:33 2005
@@ -27,7 +27,7 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.authn.LdapPrincipal;
 import org.apache.ldap.server.partition.DirectoryPartitionNexus;
 
@@ -53,7 +53,7 @@
      * @param env the JNDI environment parameters
      * @throws NamingException the context cannot be created
      */
-    public ServerLdapContext( ContextFactoryService service, Hashtable env ) throws NamingException
+    public ServerLdapContext( DirectoryService service, Hashtable env ) throws NamingException
     {
         super( service, env );
     }

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=307234&r1=307233&r2=307234&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 Fri Oct  7 18:43:33 2005
@@ -30,7 +30,7 @@
 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.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
@@ -52,7 +52,7 @@
     private ValueNormalizingVisitor visitor;
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         AttributeTypeRegistry attributeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         NameComponentNormalizer ncn = new PerComponentNormalizer( attributeRegistry );

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=307234&r1=307233&r2=307234&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 Fri Oct  7 18:43:33 2005
@@ -36,7 +36,7 @@
 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.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
 import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
@@ -92,7 +92,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         nexus = factoryCfg.getPartitionNexus();
         registry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/AbstractDirectoryPartition.java Fri Oct  7 18:43:33 2005
@@ -29,7 +29,7 @@
 import javax.naming.directory.ModificationItem;
 
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 
 /**
@@ -42,9 +42,9 @@
  */
 public abstract class AbstractDirectoryPartition implements DirectoryPartition
 {
-    /** {@link ContextFactoryConfiguration} specified at {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}. */
-    private ContextFactoryConfiguration factoryCfg;
-    /** {@link DirectoryPartitionConfiguration} specified at {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}. */
+    /** {@link DirectoryServiceConfiguration} specified at {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}. */
+    private DirectoryServiceConfiguration factoryCfg;
+    /** {@link DirectoryPartitionConfiguration} specified at {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}. */
     private DirectoryPartitionConfiguration cfg;
     /** <tt>true</tt> if and only if this partition is initialized. */
     private boolean initialized;
@@ -60,7 +60,7 @@
      * without any errors.  {@link #destroy()} is called automatically as a clean-up process
      * if {@link #doInit()} throws an exception.
      */
-    public final void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
+    public final void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         if( initialized )
         {
@@ -131,17 +131,17 @@
     }
 
     /**
-     * Returns {@link ContextFactoryConfiguration} that is provided from
-     * {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}.
+     * Returns {@link DirectoryServiceConfiguration} that is provided from
+     * {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}.
      */
-    public final ContextFactoryConfiguration getFactoryConfiguration()
+    public final DirectoryServiceConfiguration getFactoryConfiguration()
     {
         return factoryCfg;
     }
     
     /**
      * Returns {@link DirectoryPartitionConfiguration} that is provided from
-     * {@link #init(ContextFactoryConfiguration, DirectoryPartitionConfiguration)}.
+     * {@link #init(DirectoryServiceConfiguration, DirectoryPartitionConfiguration)}.
      */
     public final DirectoryPartitionConfiguration getConfiguration()
     {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DefaultDirectoryPartitionNexus.java Fri Oct  7 18:43:33 2005
@@ -58,7 +58,7 @@
 import org.apache.ldap.common.util.DateUtils;
 import org.apache.ldap.common.util.NamespaceTools;
 import org.apache.ldap.common.util.SingletonEnumeration;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration;
 import org.apache.ldap.server.partition.impl.btree.jdbm.JdbmDirectoryPartition;
@@ -93,7 +93,7 @@
     /** the closed state of this partition */
     private boolean initialized;
 
-    private ContextFactoryConfiguration factoryCfg;
+    private DirectoryServiceConfiguration factoryCfg;
 
     /** the system backend */
     private DirectoryPartition system;
@@ -147,7 +147,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         // NOTE: We ignore ContextPartitionConfiguration parameter here.
         if( initialized )

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartition.java Fri Oct  7 18:43:33 2005
@@ -29,7 +29,7 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 
 
@@ -58,7 +58,7 @@
     /**
      * Initializes this partition.
      */
-    void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException;
+    void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException;
     
     
     /**

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java Fri Oct  7 18:43:33 2005
@@ -33,8 +33,8 @@
 import javax.naming.ldap.LdapContext;
 
 import org.apache.ldap.common.filter.ExprNode;
-import org.apache.ldap.server.ContextFactoryConfiguration;
-import org.apache.ldap.server.ContextFactoryService;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
+import org.apache.ldap.server.DirectoryService;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.event.EventService;
 import org.apache.ldap.server.interceptor.InterceptorChain;
@@ -55,8 +55,8 @@
 public class DirectoryPartitionNexusProxy extends DirectoryPartitionNexus
 {
     private final Context caller;
-    private final ContextFactoryService service;
-    private final ContextFactoryConfiguration configuration;
+    private final DirectoryService service;
+    private final DirectoryServiceConfiguration configuration;
 
     /**
      * Creates a new instance.
@@ -64,7 +64,7 @@
      * @param caller a JNDI {@link Context} object that will call this proxy
      * @param service a JNDI service
      */
-    public DirectoryPartitionNexusProxy( Context caller, ContextFactoryService service )
+    public DirectoryPartitionNexusProxy( Context caller, DirectoryService service )
     {
         this.caller = caller;
         this.service = service;
@@ -75,7 +75,7 @@
         return this.configuration.getPartitionNexus().getLdapContext();
     }
 
-    public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
+    public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg )
     {
     }
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/BTreeDirectoryPartition.java Fri Oct  7 18:43:33 2005
@@ -36,7 +36,7 @@
 import org.apache.ldap.common.message.LockableAttributesImpl;
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.util.ArrayUtils;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.enumeration.SearchResultEnumeration;
 import org.apache.ldap.server.partition.DirectoryPartition;
@@ -110,7 +110,7 @@
     }
     
 
-    public void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         attributeTypeRegistry = factoryCfg.getGlobalRegistries().getAttributeTypeRegistry();
         OidRegistry oidRegistry = factoryCfg.getGlobalRegistries().getOidRegistry();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/impl/btree/jdbm/JdbmDirectoryPartition.java Fri Oct  7 18:43:33 2005
@@ -47,7 +47,7 @@
 import org.apache.ldap.common.schema.AttributeType;
 import org.apache.ldap.common.schema.Normalizer;
 import org.apache.ldap.common.util.NamespaceTools;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.DirectoryPartitionConfiguration;
 import org.apache.ldap.server.partition.DirectoryPartition;
 import org.apache.ldap.server.partition.impl.btree.BTreeDirectoryPartition;
@@ -117,7 +117,7 @@
     {
     }
 
-    public synchronized void init( ContextFactoryConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
+    public synchronized void init( DirectoryServiceConfiguration factoryCfg, DirectoryPartitionConfiguration cfg ) throws NamingException
     {
         this.upSuffix = new LdapName( cfg.getSuffix() );
         this.normSuffix = cfg.getNormalizedSuffix( factoryCfg.getGlobalRegistries().getMatchingRuleRegistry() );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/SchemaService.java Fri Oct  7 18:43:33 2005
@@ -51,7 +51,7 @@
 import org.apache.ldap.common.exception.LdapSchemaViolationException;
 import org.apache.ldap.common.exception.LdapInvalidAttributeIdentifierException;
 import org.apache.ldap.common.exception.LdapNoSuchAttributeException;
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.configuration.InterceptorConfiguration;
 import org.apache.ldap.server.enumeration.SearchResultFilteringEnumeration;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
@@ -112,7 +112,7 @@
     }
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         this.nexus = factoryCfg.getPartitionNexus();
         this.globalRegistries = factoryCfg.getGlobalRegistries();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java?rev=307234&r1=307233&r2=307234&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/subtree/SubentryService.java Fri Oct  7 18:43:33 2005
@@ -17,7 +17,7 @@
 package org.apache.ldap.server.subtree;
 
 
-import org.apache.ldap.server.ContextFactoryConfiguration;
+import org.apache.ldap.server.DirectoryServiceConfiguration;
 import org.apache.ldap.server.interceptor.BaseInterceptor;
 import org.apache.ldap.server.interceptor.NextInterceptor;
 import org.apache.ldap.server.enumeration.SearchResultFilter;
@@ -110,14 +110,14 @@
 
     /** the hash mapping the DN of a subentry to its SubtreeSpecification */
     private final Map subtrees = new HashMap();
-    private ContextFactoryConfiguration factoryCfg;
+    private DirectoryServiceConfiguration factoryCfg;
     private DnParser dnParser;
     private SubtreeSpecificationParser ssParser;
     private SubtreeEvaluator evaluator;
     private DirectoryPartitionNexus nexus;
 
 
-    public void init( ContextFactoryConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
+    public void init( DirectoryServiceConfiguration factoryCfg, InterceptorConfiguration cfg ) throws NamingException
     {
         super.init( factoryCfg, cfg );
         this.nexus = factoryCfg.getPartitionNexus();



Mime
View raw message