You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/10/11 12:54:53 UTC

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup BootstrapService.java

remm        2002/10/11 03:54:53

  Modified:    catalina/src/share/org/apache/catalina/startup
                        BootstrapService.java
  Log:
  - Remove dependency on daemon. Add one on launcher.
  
  Revision  Changes    Path
  1.3       +12 -20    jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
  
  Index: BootstrapService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BootstrapService.java	24 Aug 2002 02:27:27 -0000	1.2
  +++ BootstrapService.java	11 Oct 2002 10:54:52 -0000	1.3
  @@ -71,8 +71,6 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.ArrayList;
  -import org.apache.commons.daemon.Daemon;
  -import org.apache.commons.daemon.DaemonContext;
   import org.apache.catalina.loader.StandardClassLoader;
   
   
  @@ -88,8 +86,7 @@
    * @version $Revision$ $Date$
    */
   
  -public final class BootstrapService 
  -    implements Daemon {
  +public final class BootstrapService {
   
   
       // ------------------------------------------------------- Static Variables
  @@ -98,7 +95,7 @@
       /**
        * Service object used by main.
        */
  -    private static Daemon service = null;
  +    private static BootstrapService service = null;
   
   
       /**
  @@ -119,19 +116,14 @@
       /**
        * Load the Catalina Service.
        */
  -    public void init(DaemonContext context)
  +    public void init(String[] arguments)
           throws Exception {
   
  -        String arguments[] = null;
  -
  -        /* Read the arguments from the Daemon context */
  -        if (context!=null) {
  -            arguments = context.getArguments();
  -            if (arguments!=null) {
  -                for (int i = 0; i < arguments.length; i++) {
  -                    if (arguments[i].equals("-debug")) {
  -                        debug = 1;
  -                    }
  +        // Read the arguments
  +        if (arguments != null) {
  +            for (int i = 0; i < arguments.length; i++) {
  +                if (arguments[i].equals("-debug")) {
  +                    debug = 1;
                   }
               }
           }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>