You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2004/03/17 00:23:33 UTC
cvs commit: jakarta-tomcat-4.0/webapps/tomcat-docs/config context.xml resources.xml
markt 2004/03/16 15:23:33
Modified: catalina/src/share/org/apache/catalina/core
StandardContext.java
webapps/tomcat-docs/config context.xml resources.xml
Log:
Fix bug 18079.
- Modify StandardContext so cached attribute of resources has an effect
- Update docs to reflect changes
- Remove unused imports highlighted by Eclipse
- Reported by 'gawix'
Revision Changes Path
1.123 +8 -25 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.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- StandardContext.java 27 Dec 2003 20:37:58 -0000 1.122
+++ StandardContext.java 16 Mar 2004 23:23:33 -0000 1.123
@@ -69,35 +69,18 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.net.URL;
import java.util.Iterator;
import java.util.TreeMap;
import java.util.Hashtable;
import java.util.Stack;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.naming.NamingException;
-import javax.naming.InitialContext;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
-import javax.naming.StringRefAddr;
import javax.naming.directory.DirContext;
-import org.apache.naming.NamingContext;
import org.apache.naming.ContextBindings;
-import org.apache.naming.ContextAccessController;
-import org.apache.naming.EjbRef;
-import org.apache.naming.ResourceRef;
-import org.apache.naming.ResourceEnvRef;
-import org.apache.naming.TransactionRef;
import org.apache.naming.resources.BaseDirContext;
import org.apache.naming.resources.FileDirContext;
import org.apache.naming.resources.ProxyDirContext;
@@ -106,10 +89,8 @@
import org.apache.catalina.Container;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Globals;
-import org.apache.catalina.HttpRequest;
import org.apache.catalina.InstanceListener;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
@@ -134,7 +115,6 @@
import org.apache.catalina.deploy.ResourceParams;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
-import org.apache.catalina.loader.StandardClassLoader;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.util.CharsetMapper;
@@ -1168,7 +1148,10 @@
return;
if (resources instanceof BaseDirContext) {
- ((BaseDirContext) resources).setCached(isCachingAllowed());
+ ((BaseDirContext) resources).setCached(
+ isCachingAllowed() &&
+ ((BaseDirContext) resources).isCached()
+ );
}
if (resources instanceof FileDirContext) {
filesystemBased = true;
1.13 +7 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/context.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- context.xml 12 Jan 2003 17:26:48 -0000 1.12
+++ context.xml 16 Mar 2004 23:23:33 -0000 1.13
@@ -169,6 +169,13 @@
<attributes>
+ <attribute name="cachingAllowed" required="false">
+ <p>This boolean flag indicates if the resources may be cached. It
+ defaults to <code>true</code>. If set to <code>false</code>, this
+ flag overrides the <em>cached</em> attribute of any contained
+ <a href="resources.html">Resources</a>
element.</p>
+ </attribute>
+
<attribute name="debug" required="false">
<p>The level of debugging detail logged by this <strong>Engine</strong>
to the associated <a href="logger.html">Logger</a>. Higher numbers
1.3 +3 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml
Index: resources.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/resources.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resources.xml 12 Jan 2003 17:26:48 -0000 1.2
+++ resources.xml 16 Mar 2004 23:23:33 -0000 1.3
@@ -78,7 +78,9 @@
<attribute name="cached" required="false">
<p>This boolean flag indicates if the resources should be cached. It
- defaults to <code>true</code>.</p>
+ defaults to <code>true</code>. This flag only has an effect if the
+ <em>cachingAllowed</em> attribute of the containing
+ <a href="context.html">
Context</a> is set to <code>true</code>.</p>
</attribute>
<attribute name="caseSensitive" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org