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
Date Mon, 18 Feb 2002 09:00:54 GMT
remm        02/02/18 01:00:54

  Modified:    catalina/src/share/org/apache/catalina/startup
                        BootstrapService.java
  Log:
  - Add missing support for the new 'endorsed' directory in the various dist targets.
  
  Revision  Changes    Path
  1.12      +12 -9     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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BootstrapService.java	30 Dec 2001 01:58:20 -0000	1.11
  +++ BootstrapService.java	18 Feb 2002 09:00:54 -0000	1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
1.11 2001/12/30 01:58:20 glenn Exp $
  - * $Revision: 1.11 $
  - * $Date: 2001/12/30 01:58:20 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -86,7 +86,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.11 $ $Date: 2001/12/30 01:58:20 $
  + * @version $Revision: 1.12 $ $Date: 2002/02/18 09:00:54 $
    */
   
   public final class BootstrapService 
  @@ -137,14 +137,17 @@
   
               File unpacked[] = new File[1];
               File packed[] = new File[1];
  +            File packed2[] = new File[2];
               ClassLoaderFactory.setDebug(debug);
   
               unpacked[0] = new File(getCatalinaHome(),
                                      "common" + File.separator + "classes");
  -            packed[0] = new File(getCatalinaHome(),
  -                                 "common" + File.separator + "lib");
  +            packed2[0] = new File(getCatalinaHome(),
  +                                  "common" + File.separator + "endorsed");
  +            packed2[1] = new File(getCatalinaHome(),
  +                                  "common" + File.separator + "lib");
               commonLoader =
  -                ClassLoaderFactory.createClassLoader(unpacked, packed, null);
  +                ClassLoaderFactory.createClassLoader(unpacked, packed2, null);
   
               unpacked[0] = new File(getCatalinaHome(),
                                      "server" + File.separator + "classes");
  @@ -154,9 +157,9 @@
                   ClassLoaderFactory.createClassLoader(unpacked, packed,
                                                        commonLoader);
   
  -            unpacked[0] = new File(getCatalinaHome(),
  +            unpacked[0] = new File(getCatalinaBase(),
                                      "shared" + File.separator + "classes");
  -            packed[0] = new File(getCatalinaHome(),
  +            packed[0] = new File(getCatalinaBase(),
                                    "shared" + File.separator + "lib");
               sharedLoader =
                   ClassLoaderFactory.createClassLoader(unpacked, packed,
  
  
  

--
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