glenn 01/02/20 19:38:48
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Cleaned up library/class locations
Revision Changes Path
1.12 +43 -7
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Bootstrap.java 2001/02/12 21:27:31 1.11
+++ Bootstrap.java 2001/02/21 03:38:47 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.11 2001/02/12 21:27:31 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/02/12 21:27:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
1.12 2001/02/21 03:38:47 glenn Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/02/21 03:38:47 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
* class path and therefore not visible to application level classes.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/02/12 21:27:31 $
+ * @version $Revision: 1.12 $ $Date: 2001/02/21 03:38:47 $
*/
public final class Bootstrap {
@@ -207,8 +207,26 @@
// Construct the "class path" for this class loader
ArrayList list = new ArrayList();
+ File classes = new File(System.getProperty("catalina.home"),
+ "common/classes");
+ if (classes.exists() && classes.canRead() &&
+ classes.isDirectory()) {
+ try {
+ URL url = new URL("file", null,
+ classes.getCanonicalPath() + "/");
+ if (debug >= 1)
+ log(" Adding " + url.toString());
+ list.add(url.toString());
+ } catch (IOException e) {
+ System.out.println("Cannot create URL for " +
+ classes.getAbsolutePath());
+ e.printStackTrace(System.out);
+ System.exit(1);
+ }
+ }
+
File directory = new File(System.getProperty("catalina.home"),
- "bin");
+ "common/lib");
if (!directory.exists() || !directory.canRead() ||
!directory.isDirectory()) {
System.out.println("Directory " + directory.getAbsolutePath()
@@ -258,7 +276,7 @@
ArrayList list = new ArrayList();
File classes = new File(System.getProperty("catalina.home"),
- "classes");
+ "server/classes");
if (classes.exists() && classes.canRead() &&
classes.isDirectory()) {
try {
@@ -276,7 +294,7 @@
}
File directory = new File(System.getProperty("catalina.home"),
- "server");
+ "server/lib");
if (!directory.exists() || !directory.canRead() ||
!directory.isDirectory()) {
System.out.println("Directory " + directory.getAbsolutePath()
@@ -321,6 +339,24 @@
// Construct the "class path" for this class loader
ArrayList list = new ArrayList();
+
+ File classes = new File(System.getProperty("catalina.home"),
+ "classes");
+ if (classes.exists() && classes.canRead() &&
+ classes.isDirectory()) {
+ try {
+ URL url = new URL("file", null,
+ classes.getCanonicalPath() + "/");
+ if (debug >= 1)
+ log(" Adding " + url.toString());
+ list.add(url.toString());
+ } catch (IOException e) {
+ System.out.println("Cannot create URL for " +
+ classes.getAbsolutePath());
+ e.printStackTrace(System.out);
+ System.exit(1);
+ }
+ }
File directory = new File(System.getProperty("catalina.home"),
"lib");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
