remm 01/01/14 11:53:47
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
- Fix Jasper classpath generation.
Revision Changes Path
1.16 +10 -7
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StandardLoader.java 2001/01/13 05:27:54 1.15
+++ StandardLoader.java 2001/01/14 19:53:47 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.15 2001/01/13 05:27:54 remm Exp $
- * $Revision: 1.15 $
- * $Date: 2001/01/13 05:27:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.16 2001/01/14 19:53:47 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/01/14 19:53:47 $
*
* ====================================================================
*
@@ -107,7 +107,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.15 $ $Date: 2001/01/13 05:27:54 $
+ * @version $Revision: 1.16 $ $Date: 2001/01/14 19:53:47 $
*/
public final class StandardLoader
@@ -806,6 +806,9 @@
repository = repository.substring(7);
else if (repository.startsWith("file:"))
repository = repository.substring(5);
+ else if (repository.startsWith("jndi:"))
+ repository =
+ servletContext.getRealPath(repository.substring(5));
else
continue;
if (repository.endsWith("/"))
@@ -821,7 +824,7 @@
}
// Store the assembled class path as a servlet context attribute
- servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
+ servletContext.setAttribute(Globals.CLASS_PATH_ATTR,
classpath.toString());
}
@@ -839,7 +842,7 @@
((Context) container).getServletContext();
// Add the WEB-INF/classes subdirectory
- URL classesURL = null;
+ URL classesURL = null;
try {
classesURL = servletContext.getResource("/WEB-INF/classes");
} catch (MalformedURLException e) {
@@ -869,7 +872,7 @@
}
addRepository(classesURLString + "/");
}
-
+
// Add the WEB-INF/lib/*.jar files
// FIXME - This still requires disk directory! Scan JARs if present
File libFile = new File(((Context) container).getDocBase(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
