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

[craigmcc]

craigmcc    01/08/14 17:55:25

  Modified:    catalina/src/share/org/apache/catalina/startup
                        Bootstrap.java
  Log:
  Use more platform-sensitive paths when building class loaders.  Christoper
  caught two of the cases, but there were a few more.
  
  Windows ... gotta love it.  :-)
  
  Submitted by: Christopher Cain <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.23      +9 -9      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Bootstrap.java    2001/08/14 19:30:07     1.22
  +++ Bootstrap.java    2001/08/15 00:55:25     1.23
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
 1.22 2001/08/14 19:30:07 craigmcc Exp $
  - * $Revision: 1.22 $
  - * $Date: 2001/08/14 19:30:07 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
 1.23 2001/08/15 00:55:25 craigmcc Exp $
  + * $Revision: 1.23 $
  + * $Date: 2001/08/15 00:55:25 $
    *
    * ====================================================================
    *
  @@ -85,7 +85,7 @@
    * class path and therefore not visible to application level classes.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.22 $ $Date: 2001/08/14 19:30:07 $
  + * @version $Revision: 1.23 $ $Date: 2001/08/15 00:55:25 $
    */
   
   public final class Bootstrap {
  @@ -238,12 +238,12 @@
   
           // Add the "common/classes" directory if it exists
           File classes = new File(System.getProperty("catalina.home"),
  -                                "common/classes");
  +                                "common" + File.separator + "classes");
           if (classes.exists() && classes.canRead() &&
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());
  @@ -314,12 +314,12 @@
   
           // Add the "server/classes" directory if it exists
           File classes = new File(System.getProperty("catalina.home"),
  -                                "server/classes");
  +                                "server" + File.separator + "classes");
           if (classes.exists() && classes.canRead() &&
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());
  @@ -393,7 +393,7 @@
               classes.isDirectory()) {
               try {
                   URL url = new URL("file", null,
  -                                  classes.getCanonicalPath() + "/");
  +                                  classes.getCanonicalPath() + File.separator);
                   if (debug >= 1)
                       log("  Adding " + url.toString());
                   list.add(url.toString());