remm 01/06/18 19:14:49
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
Log:
- Normalize the work directory path.
- Use the new Webapp class loader instead of standard class loader.
Note : This is a one line change.
Revision Changes Path
1.63 +15 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- StandardContext.java 2001/06/13 02:32:01 1.62
+++ StandardContext.java 2001/06/19 02:14:48 1.63
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.62 2001/06/13 02:32:01 remm Exp $
- * $Revision: 1.62 $
- * $Date: 2001/06/13 02:32:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.63 2001/06/19 02:14:48 remm Exp $
+ * $Revision: 1.63 $
+ * $Date: 2001/06/19 02:14:48 $
*
* ====================================================================
*
@@ -128,7 +128,7 @@
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
import org.apache.catalina.loader.StandardClassLoader;
-import org.apache.catalina.loader.StandardLoader;
+import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.RequestUtil;
@@ -141,7 +141,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.62 $ $Date: 2001/06/13 02:32:01 $
+ * @version $Revision: 1.63 $ $Date: 2001/06/19 02:14:48 $
*/
public class StandardContext
@@ -3151,7 +3151,7 @@
if (getLoader() == null) { // (2) Required by Manager
if (debug >= 1)
log("Configuring default Loader");
- setLoader(new StandardLoader(getParentClassLoader()));
+ setLoader(new WebappLoader(getParentClassLoader()));
}
if (getManager() == null) { // (3) After prerequisites
if (debug >= 1)
@@ -3740,8 +3740,15 @@
// Create this directory if necessary
File dir = new File(workDir);
- if (!dir.isAbsolute())
- dir = new File(System.getProperty("catalina.home"), workDir);
+ if (!dir.isAbsolute()) {
+ File catalinaHome = new File(System.getProperty("catalina.home"));
+ String catalinaHomePath = null;
+ try {
+ catalinaHomePath = catalinaHome.getCanonicalPath();
+ dir = new File(catalinaHomePath, workDir);
+ } catch (IOException e) {
+ }
+ }
dir.mkdirs();
// Set the appropriate servlet context attribute
