craigmcc 01/09/11 16:34:43 Modified: catalina/src/share/org/apache/catalina/startup Bootstrap.java BootstrapService.java Catalina.java Log: Consistently initialize system property "catalina.base" from "catalina.home" if it is not set already. Revision Changes Path 1.25 +8 -4 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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Bootstrap.java 2001/08/29 01:27:36 1.24 +++ Bootstrap.java 2001/09/11 23:34:43 1.25 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v 1.24 2001/08/29 01:27:36 remm Exp $ - * $Revision: 1.24 $ - * $Date: 2001/08/29 01:27:36 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v 1.25 2001/09/11 23:34:43 craigmcc Exp $ + * $Revision: 1.25 $ + * $Date: 2001/09/11 23:34:43 $ * * ==================================================================== * @@ -85,7 +85,7 @@ * class path and therefore not visible to application level classes. * * @author Craig R. McClanahan - * @version $Revision: 1.24 $ $Date: 2001/08/29 01:27:36 $ + * @version $Revision: 1.25 $ $Date: 2001/09/11 23:34:43 $ */ public final class Bootstrap { @@ -123,6 +123,10 @@ loadJNDI = false; } catch (ClassNotFoundException e) { } + + // Configure catalina.base from catalina.home if not yet set + if (System.getProperty("catalina.base") == null) + System.setProperty("catalina.base", getCatalinaHome()); // Construct the class loaders we will need ClassLoader commonLoader = createCommonLoader(loadJNDI); 1.5 +11 -7 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- BootstrapService.java 2001/08/29 02:44:03 1.4 +++ BootstrapService.java 2001/09/11 23:34:43 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v 1.4 2001/08/29 02:44:03 remm Exp $ - * $Revision: 1.4 $ - * $Date: 2001/08/29 02:44:03 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v 1.5 2001/09/11 23:34:43 craigmcc Exp $ + * $Revision: 1.5 $ + * $Date: 2001/09/11 23:34:43 $ * * ==================================================================== * @@ -86,7 +86,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.4 $ $Date: 2001/08/29 02:44:03 $ + * @version $Revision: 1.5 $ $Date: 2001/09/11 23:34:43 $ */ public final class BootstrapService @@ -126,8 +126,8 @@ System.out.println("Create Catalina server"); // Set Catalina path - setCatalinaBase(); setCatalinaHome(); + setCatalinaBase(); // Construct the class loaders we will need ClassLoader commonLoader = createCommonLoader(); @@ -594,8 +594,12 @@ if (System.getProperty("catalina.base") != null) return; - System.setProperty("catalina.base", - System.getProperty("user.dir")); + if (System.getProperty("catalina.home") != null) + System.setProperty("catalina.base", + System.getProperty("catalina.home")); + else + System.setProperty("catalina.base", + System.getProperty("user.dir")); } 1.32 +6 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java Index: Catalina.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Catalina.java 2001/09/08 16:40:48 1.31 +++ Catalina.java 2001/09/11 23:34:43 1.32 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.31 2001/09/08 16:40:48 remm Exp $ - * $Revision: 1.31 $ - * $Date: 2001/09/08 16:40:48 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.32 2001/09/11 23:34:43 craigmcc Exp $ + * $Revision: 1.32 $ + * $Date: 2001/09/11 23:34:43 $ * * ==================================================================== * @@ -98,7 +98,7 @@ * </u> * * @author Craig R. McClanahan - * @version $Revision: 1.31 $ $Date: 2001/09/08 16:40:48 $ + * @version $Revision: 1.32 $ $Date: 2001/09/11 23:34:43 $ */ public class Catalina { @@ -172,8 +172,8 @@ */ public void process(String args[]) { - setCatalinaBase(); setCatalinaHome(); + setCatalinaBase(); try { if (arguments(args)) execute(); @@ -694,7 +694,7 @@ if (System.getProperty("catalina.base") != null) return; System.setProperty("catalina.base", - System.getProperty("user.dir")); + System.getProperty("catalina.home")); }