You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/09/25 01:23:50 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader StandardLoader.java
craigmcc 00/09/24 16:23:49
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
Modify the servlet context attribute we set to pass the webapp classpath
to Jasper, to reflect the fact that StandardClassLoader now uses URLs.
Jasper will need to be adjusted at some future point in order to support
running out of a webapp or a remote document root.
Revision Changes Path
1.6 +10 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
Index: StandardLoader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardLoader.java 2000/09/22 23:52:50 1.5
+++ StandardLoader.java 2000/09/24 23:23:49 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.5 2000/09/22 23:52:50 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/09/22 23:52:50 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v 1.6 2000/09/24 23:23:49 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/09/24 23:23:49 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* is not present, the system class loader will be used instead.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/09/22 23:52:50 $
+ * @version $Revision: 1.6 $ $Date: 2000/09/24 23:23:49 $
*/
public final class StandardLoader
@@ -742,7 +742,12 @@
for (int i = 0; i < repositories.length; i++) {
if (i > 0)
classpath.append(File.pathSeparator);
- classpath.append(repositories[i]);
+ String repository = repositories[i];
+ if (repository.startsWith("file:"))
+ repository = repository.substring(5);
+ if (repository.endsWith("/"))
+ repository = repository.substring(0, repository.length() - 1);
+ classpath.append(repository);
}
servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
classpath.toString());