svn commit: r307236 - in /directory: apacheds/trunk/core/src/main/java/org/apache/ldap/server/ apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/ standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ standalone/trunk/osgi/d...

Author: trustin
Date: Fri Oct  7 18:57:58 2005
New Revision: 307236

URL: http://svn.apache.org/viewcvs?rev=307236&view=rev
Log:
* Fixed compilation errors 
* Removed ContextFactoryService from all source code


Modified:
    
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
    
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/partition/DirectoryPartitionNexusProxy.java
    
directory/standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ChangepwConfig.java
    
directory/standalone/trunk/osgi/dns/src/main/java/org/apache/dns/DnsConfig.java
    
directory/standalone/trunk/osgi/kerberos/src/main/java/org/apache/kerberos/KerberosConfig.java
    
directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
    
directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoaderConfiguration.java

Modified: 
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
URL: 
http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
 (original)
+++ 
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/DefaultDirectoryService.java
 Fri Oct  7 18:57:58 2005
@@ -119,7 +119,7 @@
                 catch( NamingException e )
                 {
                     log.warn(
-                            "Failed to shut down ContextFactoryService: " +
+                            "Failed to shut down the directory service: " +
                             DefaultDirectoryService.this.instanceId, e );
                 }
             }

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=307236&r1=307235&r2=307236&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:57:58 2005
@@ -430,7 +430,7 @@
     private void ensureStarted() throws ServiceUnavailableException {
         if( !service.isStarted() )
         {
-            throw new ServiceUnavailableException( "ContextFactoryService is 
not started." );
+            throw new ServiceUnavailableException( "Directory service is not 
started." );
         }
     }
 

Modified: 
directory/standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ChangepwConfig.java
URL: 
http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ChangepwConfig.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ChangepwConfig.java
 (original)
+++ 
directory/standalone/trunk/osgi/changepw/src/main/java/org/apache/changepw/ChangepwConfig.java
 Fri Oct  7 18:57:58 2005
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 
 import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.osgi.service.cm.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +49,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 ChangepwConfig( String instanceId ) throws ConfigurationException
     {

Modified: 
directory/standalone/trunk/osgi/dns/src/main/java/org/apache/dns/DnsConfig.java
URL: 
http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/dns/src/main/java/org/apache/dns/DnsConfig.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/standalone/trunk/osgi/dns/src/main/java/org/apache/dns/DnsConfig.java 
(original)
+++ 
directory/standalone/trunk/osgi/dns/src/main/java/org/apache/dns/DnsConfig.java 
Fri Oct  7 18:57:58 2005
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 
 import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.osgi.service.cm.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +49,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 DnsConfig( String instanceId ) throws ConfigurationException
     {

Modified: 
directory/standalone/trunk/osgi/kerberos/src/main/java/org/apache/kerberos/KerberosConfig.java
URL: 
http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/kerberos/src/main/java/org/apache/kerberos/KerberosConfig.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/standalone/trunk/osgi/kerberos/src/main/java/org/apache/kerberos/KerberosConfig.java
 (original)
+++ 
directory/standalone/trunk/osgi/kerberos/src/main/java/org/apache/kerberos/KerberosConfig.java
 Fri Oct  7 18:57:58 2005
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 
 import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.osgi.service.cm.ConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +49,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 KerberosConfig( String instanceId ) throws ConfigurationException
     {

Modified: 
directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
URL: 
http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
 (original)
+++ 
directory/standalone/trunk/osgi/ldap/src/main/java/org/apache/ldap/LdapConfig.java
 Fri Oct  7 18:57:58 2005
@@ -21,7 +21,7 @@
 import java.util.Hashtable;
 
 import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 import org.osgi.service.cm.ConfigurationException;
 
 public class LdapConfig extends Configuration
@@ -47,7 +47,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 LdapConfig( String instanceId ) throws ConfigurationException
     {

Modified: 
directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoaderConfiguration.java
URL: 
http://svn.apache.org/viewcvs/directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoaderConfiguration.java?rev=307236&r1=307235&r2=307236&view=diff
==============================================================================
--- 
directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoaderConfiguration.java
 (original)
+++ 
directory/standalone/trunk/osgi/loader/src/main/java/org/apache/ldap/server/loader/LoaderConfiguration.java
 Fri Oct  7 18:57:58 2005
@@ -18,7 +18,7 @@
 package org.apache.ldap.server.loader;
 
 import org.apache.ldap.server.configuration.Configuration;
-import org.apache.ldap.server.jndi.ContextFactoryService;
+import org.apache.ldap.server.DirectoryService;
 
 public class LoaderConfiguration extends Configuration
 {
@@ -31,7 +31,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 LoaderConfiguration( String instanceId )
     {