glenn 02/03/02 08:38:58
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
webapps/tomcat-docs/config host.xml
Log:
Minor fix to the below changes.
This fixes a spec compliance bug, SRV.3.7.1 states that the
tempdir for a Servlet Context must be unique.
Added the Engine name as a directory path component when creating
the default work directory for a web application. This fixes a bug
where the same work directory would be used for the http and https version
of a virtual host.
Added the workDir attribute to the Host configuration. This makes it
easier to set the base directory where the work directories for
applications are placed when virtual hosting sites with Tomcat.
Revision Changes Path
1.101 +7 -5
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.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- StandardContext.java 28 Feb 2002 17:20:56 -0000 1.100
+++ StandardContext.java 2 Mar 2002 16:38:58 -0000 1.101
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.100 2002/02/28 17:20:56 glenn Exp $
- * $Revision: 1.100 $
- * $Date: 2002/02/28 17:20:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.101 2002/03/02 16:38:58 glenn Exp $
+ * $Revision: 1.101 $
+ * $Date: 2002/03/02 16:38:58 $
*
* ====================================================================
*
@@ -147,7 +147,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.100 $ $Date: 2002/02/28 17:20:56 $
+ * @version $Revision: 1.101 $ $Date: 2002/03/02 16:38:58 $
*/
public class StandardContext
@@ -3840,7 +3840,9 @@
Container parentHost = getParent();
if (parentHost != null) {
hostName = parentHost.getName();
- hostWorkDir = ((StandardHost)parentHost).getWorkDir();
+ if (parentHost instanceof StandardHost) {
+ hostWorkDir = ((StandardHost)parentHost).getWorkDir();
+ }
Container parentEngine = parentHost.getParent();
if (parentEngine != null) {
engineName = parentEngine.getName();
1.10 +12 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml
Index: host.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/host.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- host.xml 1 Mar 2002 05:46:52 -0000 1.9
+++ host.xml 2 Mar 2002 16:38:58 -0000 1.10
@@ -136,6 +136,18 @@
Deployment</a> for more information.</p>
</attribute>
+ <attribute name="workDir" required="false">
+ <p>Pathname to a scratch directory to be used by applications for
+ this Host. Each application will have its own sub directory with
+ temporary read-write use. Configuring a Context workDir will override
+ use of the Host workDir configuration. This directory will be made
+ visible to servlets in the web application by a servlet context
+ attribute (of type <code>java.io.File</code>) named
+ <code>javax.servlet.context.tempdir</code> as described in the
+ Servlet Specification. If not specified, a suitable directory
+ underneath <code>$CATALINA_HOME/work</code> will be provided.</p>
+ </attribute>
+
</attributes>
</subsection>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
