remm 01/01/28 12:06:17
Modified: catalina/src/share/org/apache/catalina/loader
StandardLoader.java
Log:
- The /WEB-INF/classes and /WEB-INF/lib paths in the work directories
are now used for the Jasper environment. That should prevent any name
conflict.
Thanks to Glenn Nielsen for suggesting this modification.
Revision Changes Path
1.19 +11 -8
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StandardLoader.java 2001/01/25 19:09:27 1.18
+++ StandardLoader.java 2001/01/28 20:06:17 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.18 2001/01/25 19:09:27 remm Exp $
- * $Revision: 1.18 $
- * $Date: 2001/01/25 19:09:27 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
1.19 2001/01/28 20:06:17 remm Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/01/28 20:06:17 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.18 $ $Date: 2001/01/25 19:09:27 $
+ * @version $Revision: 1.19 $ $Date: 2001/01/28 20:06:17 $
*/
public final class StandardLoader
@@ -836,8 +836,8 @@
if (!(classpath.equals("")))
classpath = File.pathSeparator + classpath;
- File classesDir = new File(workDir, "/classes");
- classesDir.mkdir();
+ File classesDir = new File(workDir, classesName);
+ classesDir.mkdirs();
classpath = classesDir.getAbsolutePath() + classpath;
copyDir(resources, classesDir);
@@ -956,11 +956,14 @@
// Loading the work directory
File workDir =
(File) servletContext.getAttribute(Globals.WORK_DIR_ATTR);
-
if (workDir != null) {
DirContext resources = container.getResources();
String libName = "/WEB-INF/lib";
+
+ File destDir = new File(workDir, libName);
+ destDir.mkdirs();
+
DirContext libDir = null;
// Looking up directory /WEB-INF/lib in the context
try {
@@ -989,7 +992,7 @@
log(" Adding '" + "file: " +
libName + "/" + filename + "'");
// Copying the file to the work dir
- File dest = new File(workDir, filename);
+ File dest = new File(destDir, filename);
if (copy(fileURL.openStream(),
new FileOutputStream(dest))) {
if (n > 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
