remm 01/01/11 22:46:54
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
- Refactoring with loading repositories from DirContext.
- Unfortunately, the Loader / ClassLoader was heavily biased towards
loading its class repositories from the filesystem. This causes Catalina to
crash on startup at the moment. Additional refactoring of the classloader is
needed to address this (and will be done ASAP).
Revision Changes Path
1.14 +11 -11
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardLoader.java 2000/12/22 00:37:50 1.13
+++ StandardLoader.java 2001/01/12 06:46:54 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.13 2000/12/22 00:37:50 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2000/12/22 00:37:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.14 2001/01/12 06:46:54 remm Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/01/12 06:46:54 $
*
* ====================================================================
*
@@ -83,7 +83,6 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
-import org.apache.catalina.Resources;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -101,7 +100,7 @@
* is not present, the system class loader will be used instead.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.13 $ $Date: 2000/12/22 00:37:50 $
+ * @version $Revision: 1.14 $ $Date: 2001/01/12 06:46:54 $
*/
public final class StandardLoader
@@ -823,12 +822,13 @@
if (!(container instanceof Context))
return;
- Resources resources = ((Context) container).getResources();
+ ServletContext servletContext =
+ ((Context) container).getServletContext();
// Add the WEB-INF/classes subdirectory
URL classesURL = null;
try {
- classesURL = resources.getResource("/WEB-INF/classes");
+ classesURL = servletContext.getResource("/WEB-INF/classes");
} catch (MalformedURLException e) {
classesURL = null;
}
@@ -860,12 +860,12 @@
// Add the WEB-INF/lib/*.jar files
URL libURL = null;
try {
- libURL = resources.getResource("/WEB-INF/lib");
+ libURL = servletContext.getResource("/WEB-INF/lib");
} catch (MalformedURLException e) {
libURL = null;
}
// FIXME - This still requires disk directory! Scan JARs if present
- if ((libURL != null) && "file".equals(libURL.getProtocol())) {
+ if ((libURL != null) && "file".equals(libURL.getProtocol())) {
File libFile = new File(libURL.getFile());
if (libFile.exists() && libFile.canRead() &&
libFile.isDirectory()) {
@@ -884,8 +884,8 @@
}
}
}
- }
-
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
