You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/10/15 16:41:20 UTC
svn commit: r584799 -
/directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Author: akarasulu
Date: Mon Oct 15 07:41:20 2007
New Revision: 584799
URL: http://svn.apache.org/viewvc?rev=584799&view=rev
Log:
cleaning up ApacheDS object
Modified:
directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Modified: directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=584799&r1=584798&r2=584799&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/branches/bigbang/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Mon Oct 15 07:41:20 2007
@@ -58,8 +58,6 @@
*/
public class ApacheDS
{
- public static final int MAX_THREADS_DEFAULT = 32;
-
private static final String WINDOWSFILE_ATTR = "windowsFilePath";
private static final String UNIXFILE_ATTR = "unixFilePath";
private static final Logger LOG = LoggerFactory.getLogger( ApacheDS.class.getName() );
@@ -88,13 +86,14 @@
public void startup() throws NamingException, IOException
{
- loadLdifs();
if ( ! directoryService.isStarted() )
{
directoryService.startup();
}
+ loadLdifs();
+
if ( ldapServer != null && ! ldapServer.isStarted() )
{
ldapServer.start();
@@ -104,32 +103,15 @@
{
ldapsServer.start();
}
-
-/*
- if ( ldapServer == null )
- {
- ldapServer = new LdapServer( tcpAcceptor );
- }
-
- if ( ldapsServer == null )
- {
- ldapsServer = new LdapServer( tcpAcceptor );
- }
-
-
- if ( ldapsServer != null && ! ldapsServer.isStarted() )
- {
- ldapsServer.start();
- }
-*/
}
public boolean isStarted()
{
- if (ldapServer != null || ldapsServer != null)
+ if ( ldapServer != null || ldapsServer != null )
{
- return (ldapServer != null && ldapServer.isStarted()) || (ldapsServer != null && ldapsServer.isStarted());
+ return ( ldapServer != null && ldapServer.isStarted() )
+ || ( ldapsServer != null && ldapsServer.isStarted() );
}
return directoryService.isStarted();
@@ -158,41 +140,18 @@
}
-/*
- public void setLdapServer( LdapServer ldapServer )
- {
- this.ldapServer = ldapServer;
- }
-*/
-
-
public LdapServer getLdapsServer()
{
return ldapsServer;
}
-/*
- public void setLdapsServer( LdapServer ldapsServer )
- {
- this.ldapsServer = ldapsServer;
- }
-*/
-
public DirectoryService getDirectoryService()
{
return directoryService;
}
-/*
- public void setDirectoryService( DirectoryService directoryService )
- {
- this.directoryService = directoryService;
- }
-*/
-
-
public long getSynchPeriodMillis()
{
return synchPeriodMillis;
@@ -254,12 +213,6 @@
this.ldifFilters.addAll( filters );
}
-/*
- public IoAcceptor getTcpAcceptor()
- {
- return tcpAcceptor;
- }
-*/
// ----------------------------------------------------------------------
// From CoreContextFactory: presently in intermediate step but these
@@ -267,6 +220,7 @@
// This is here simply to start to remove the JNDI dependency then further
// refactoring will be needed to place these where they belong.
// ----------------------------------------------------------------------
+
private void ensureLdifFileBase( DirContext root )
{