tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup BootstrapService.java CatalinaService.java
Date Mon, 18 Feb 2002 19:59:29 GMT
remm        02/02/18 11:59:29

  Modified:    catalina/src/share/org/apache/catalina/startup
                        BootstrapService.java CatalinaService.java
  Log:
  - Refactoring of the service features, removing a lot of code duplication in the
    process.
  
  Revision  Changes    Path
  1.13      +31 -110   jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
  
  Index: BootstrapService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BootstrapService.java	18 Feb 2002 09:00:54 -0000	1.12
  +++ BootstrapService.java	18 Feb 2002 19:59:28 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
1.12 2002/02/18 09:00:54 remm Exp $
  - * $Revision: 1.12 $
  - * $Date: 2002/02/18 09:00:54 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
1.13 2002/02/18 19:59:28 remm Exp $
  + * $Revision: 1.13 $
  + * $Date: 2002/02/18 19:59:28 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.12 $ $Date: 2002/02/18 09:00:54 $
  + * @version $Revision: 1.13 $ $Date: 2002/02/18 19:59:28 $
    */
   
   public final class BootstrapService 
  @@ -97,15 +97,15 @@
   
   
       /**
  -     * Debugging detail level for processing the startup.
  +     * Service object used by main.
        */
  -    private static int debug = 0;
  +    private static Service service = null;
   
   
       /**
  -     * Catalina instance.
  +     * Debugging detail level for processing the startup.
        */
  -    private static Object catalina = null;
  +    private static int debug = 0;
   
   
       /**
  @@ -123,7 +123,7 @@
       public void load(ServiceController controller, String arguments[])
           throws Throwable {
   
  -        System.out.println("Create Catalina server");
  +        log("Create Catalina server");
   
           // Set Catalina path
           setCatalinaHome();
  @@ -213,12 +213,11 @@
       public void start()
           throws Throwable {
   
  -        // Call the start() method
  -        if (debug >= 1)
  -            log("Calling startup class start() method");
  +        log("Starting service");
           String methodName = "start";
           Method method = catalinaService.getClass().getMethod(methodName, null);
           method.invoke(catalinaService, null);
  +        log("Service started");
   
       }
   
  @@ -229,12 +228,11 @@
       public void stop()
           throws Throwable {
   
  -        // Call the stop() method
  -        if (debug >= 1)
  -            log("Calling startup class stop() method");
  +        log("Stopping service");
           String methodName = "stop";
           Method method = catalinaService.getClass().getMethod(methodName, null);
           method.invoke(catalinaService, null);
  +        log("Service stopped");
   
       }
   
  @@ -243,7 +241,7 @@
   
   
       /**
  -     * The main program for the bootstrap.
  +     * Main method, used for testing only.
        *
        * @param args Command line arguments to be processed
        */
  @@ -255,103 +253,26 @@
                   debug = 1;
           }
   
  -        try {
  -
  -            if (catalina == null) {
  -
  -                System.out.println("Create Catalina server");
  -
  -                // Construct the class loaders we will need
  -                ClassLoader commonLoader = null;
  -                ClassLoader catalinaLoader = null;
  -                ClassLoader sharedLoader = null;
  -                try {
  -
  -                    File unpacked[] = new File[1];
  -                    File packed[] = new File[1];
  -                    ClassLoaderFactory.setDebug(debug);
  -
  -                    unpacked[0] = new File(getCatalinaHome(),
  -                                           "common" + File.separator 
  -                                           + "classes");
  -                    packed[0] = new File(getCatalinaHome(),
  -                                         "common" + File.separator + "lib");
  -                    commonLoader =
  -                        ClassLoaderFactory.createClassLoader
  -                        (unpacked, packed, null);
  -
  -                    unpacked[0] = new File(getCatalinaHome(),
  -                                           "server" + File.separator 
  -                                           + "classes");
  -                    packed[0] = new File(getCatalinaHome(),
  -                                         "server" + File.separator + "lib");
  -                    catalinaLoader =
  -                        ClassLoaderFactory.createClassLoader(unpacked, packed,
  -                                                             commonLoader);
  -
  -                    unpacked[0] = new File(getCatalinaBase(), 
  -                                           "shared" + File.separator 
  -                                           + "classes");
  -                    packed[0] = new File(getCatalinaBase(),
  -                                         "shared" + File.separator + "lib");
  -                    sharedLoader =
  -                        ClassLoaderFactory.createClassLoader(unpacked, packed,
  -                                                             commonLoader);
  -
  -                } catch (Throwable t) {
  -
  -                    log("Class loader creation threw exception", t);
  -                    System.exit(1);
  -
  -                }
  -
  -                Thread.currentThread().setContextClassLoader(catalinaLoader);
  -
  -                SecurityClassLoad.securityClassLoad(catalinaLoader);
  -
  -                // Load our startup class and call its process() method
  -                if (debug >= 1)
  -                    log("Loading startup class");
  -                Class startupClass =
  -                    catalinaLoader.loadClass
  -                    ("org.apache.catalina.startup.CatalinaService");
  -                Object startupInstance = startupClass.newInstance();
  -
  -                // Set the shared extensions class loader
  -                if (debug >= 1)
  -                    log("Setting startup class properties");
  -                String methodName = "setParentClassLoader";
  -                Class paramTypes[] = new Class[1];
  -                paramTypes[0] = Class.forName("java.lang.ClassLoader");
  -                Object paramValues[] = new Object[1];
  -                paramValues[0] = sharedLoader;
  -                Method method = startupInstance.getClass().getMethod
  -                    (methodName, paramTypes);
  -                method.invoke(startupInstance, paramValues);
  -
  -                catalina = startupInstance;
  -
  +        if (service == null) {
  +            service = new BootstrapService();
  +            try {
  +                service.load(null, args);
  +            } catch (Throwable t) {
  +                t.printStackTrace();
  +                return;
               }
  -
  -            // Call the process() method
  -            if (debug >= 1)
  -                log("Calling startup class process() method");
  -            String methodName = "process";
  -            Class paramTypes[] = new Class[1];
  -            paramTypes[0] = args.getClass();
  -            Object paramValues[] = new Object[1];
  -            paramValues[0] = args;
  -            Method method =
  -                catalina.getClass().getMethod(methodName, paramTypes);
  -            method.invoke(catalina, paramValues);
  -
  -        } catch (Exception e) {
  -            System.out.println("Exception during startup processing");
  -            e.printStackTrace(System.out);
  -            System.exit(2);
           }
   
  -        //System.exit(0);
  +        try {
  +            String command = args[0];
  +            if (command.equals("start")) {
  +                service.start();
  +            } else if (command.equals("stop")) {
  +                service.stop();
  +            }
  +        } catch (Throwable t) {
  +            t.printStackTrace();
  +        }
   
       }
   
  
  
  
  1.6       +4 -6      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java
  
  Index: CatalinaService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CatalinaService.java	17 Oct 2001 00:44:02 -0000	1.5
  +++ CatalinaService.java	18 Feb 2002 19:59:28 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java,v
1.5 2001/10/17 00:44:02 craigmcc Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/10/17 00:44:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/CatalinaService.java,v
1.6 2002/02/18 19:59:28 remm Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/02/18 19:59:28 $
    *
    * ====================================================================
    *
  @@ -101,7 +101,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.5 $ $Date: 2001/10/17 00:44:02 $
  + * @version $Revision: 1.6 $ $Date: 2002/02/18 19:59:28 $
    */
   
   public class CatalinaService extends Catalina {
  @@ -285,8 +285,6 @@
                   }
               }
           }
  -
  -        System.out.println("Stop server complete");
   
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message