directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r785329 - in /directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server: Service.java UberjarMain.java
Date Tue, 16 Jun 2009 18:03:03 GMT
Author: elecharny
Date: Tue Jun 16 18:03:02 2009
New Revision: 785329

URL: http://svn.apache.org/viewvc?rev=785329&view=rev
Log:
Fixed the way the server was started, in order to get it *really* started !

Modified:
    directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
    directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java

Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java?rev=785329&r1=785328&r2=785329&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
(original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/Service.java
Tue Jun 16 18:03:02 2009
@@ -28,6 +28,7 @@
 import org.apache.directory.daemon.DaemonApplication;
 import org.apache.directory.daemon.InstallationLayout;
 import org.apache.directory.server.changepw.ChangePasswordServer;
+import org.apache.directory.server.configuration.ApacheDS;
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.dns.DnsServer;
@@ -66,6 +67,8 @@
     /** The Kerberos server instance */
     private KdcServer kdcServer;
     
+    private ApacheDS apacheDS;
+    
     private FileSystemXmlApplicationContext factory;
 
 
@@ -106,6 +109,7 @@
             LOG.info( "server: loading settings from ", args[0] );
             factory = new FileSystemXmlApplicationContext( new File( args[0] ).toURI().toURL().toString()
);
             ldapServer = ( LdapServer ) factory.getBean( "ldapServer" );
+            apacheDS = ( ApacheDS )factory.getBean( "apacheDS" );
         }
         else
         {
@@ -117,7 +121,7 @@
             TcpTransport tcpTransportSsl = new TcpTransport( 10636 );
             tcpTransportSsl.enableSSL( true );
             ldapServer.setTransports( new TcpTransport( 10389 ), tcpTransportSsl );
-            ldapServer.start();
+            apacheDS = new ApacheDS( ldapServer );
         }
 
         if ( install != null )
@@ -126,8 +130,7 @@
         }
 
         // And start the server now
-        start();
-
+        apacheDS.startup();
         
         if ( LOG.isInfoEnabled() )
         {

Modified: directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
URL: http://svn.apache.org/viewvc/directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java?rev=785329&r1=785328&r2=785329&view=diff
==============================================================================
--- directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
(original)
+++ directory/installers/trunk/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
Tue Jun 16 18:03:02 2009
@@ -49,17 +49,14 @@
             InstallationLayout layout = new InstallationLayout( args[0] );
             String confFile = layout.getConfigurationFile().toURI().toURL().toString();
             service.init( layout, new String[] { confFile } );
-            service.start();
         }
         else if ( args.length > 0 && new File( args[0] ).isFile() )
         {
             service.init( null, args );
-            service.start();
         }
         else
         {
             service.init( null, null );
-            service.start();
         }
     }
 }



Mime
View raw message