luehe 2003/07/22 14:01:27
Modified: catalina/src/share/org/apache/catalina Context.java
Host.java
catalina/src/share/org/apache/catalina/core
StandardContext.java StandardHost.java
StandardWrapperValve.java mbeans-descriptors.xml
Log:
Moved X-Powered-By property for servlets from Host/Context to
CoyoteConnector. If property is set to TRUE, CoyoteAdapter adds
X-Powered-By response header with value "Servlet/2,4".
Turned X-Powered-By property for JSPs into a configurable Jasper compilation
option. If set to TRUE, the generated servlet will add X-Powered-By
response header with value "JSP/2.0".
Revision Changes Path
1.8 +4 -27
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Context.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Context.java 21 Jul 2003 19:05:50 -0000 1.7
+++ Context.java 22 Jul 2003 21:01:26 -0000 1.8
@@ -427,29 +427,6 @@
public void setWrapperClass(String wrapperClass);
- /**
- * Indicates whether the generation of an X-Powered-By response header for
- * servlet-generated responses is enabled or disabled for this Context.
- *
- * <p> Unless explicitly set on this Context, this method returns the
- * X-Powered-By setting of the Host with which this Context is associated.
- *
- * @return true if generation of X-Powered-By response header is enabled,
- * false otherwise
- */
- public boolean isXpoweredBy();
-
-
- /**
- * Enables or disables the generation of an X-Powered-By header (with value
- * Servlet/2.4) for all servlet-generated responses from this Context.
- *
- * @param xpoweredBy true if generation of X-Powered-By response header is
- * to be enabled, false otherwise
- */
- public void setXpoweredBy(boolean xpoweredBy);
-
-
// --------------------------------------------------------- Public Methods
1.6 +4 -25
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java
Index: Host.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Host.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Host.java 21 Jul 2003 19:05:50 -0000 1.5
+++ Host.java 22 Jul 2003 21:01:26 -0000 1.6
@@ -227,27 +227,6 @@
public void setXmlNamespaceAware(boolean xmlNamespaceAware);
- /**
- * Indicates whether the generation of an X-Powered-By response header for
- * servlet-generated responses is enabled or disabled for this Host.
- *
- * @return true if generation of X-Powered-By response header is enabled,
- * false otherwise
- */
- public boolean isXpoweredBy();
-
-
- /**
- * Enables or disables the generation of an X-Powered-By header (with value
- * Servlet/2.4) for all servlet-generated responses from contexts
- * registered with this Host.
- *
- * @param xpoweredBy true if generation of X-Powered-By response header is
- * to be enabled, false otherwise
- */
- public void setXpoweredBy(boolean xpoweredBy);
-
-
// --------------------------------------------------------- Public Methods
1.74 +1 -57
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- StandardContext.java 22 Jul 2003 18:51:21 -0000 1.73
+++ StandardContext.java 22 Jul 2003 21:01:26 -0000 1.74
@@ -276,18 +276,6 @@
private boolean distributable = false;
- /*
- * Enables/disables generation of X-Powered-By response header
- */
- private boolean xpoweredBy;
-
-
- /*
- * Indicates whether setter for X-Powered-By property was explicitly called
- */
- private boolean xpoweredBySetterCalled;
-
-
/**
* The document root for this web application.
*/
@@ -4364,50 +4352,6 @@
}
}
- }
-
-
- /**
- * Indicates whether the generation of an X-Powered-By response header for
- * servlet-generated responses is enabled or disabled for this Context.
- *
- * <p> Unless explicitly set on this Context, this method returns the
- * X-Powered-By setting of the Host with which this Context is associated.
- *
- * @return true if generation of X-Powered-By response header is enabled,
- * false otherwise
- */
- public boolean isXpoweredBy() {
-
- boolean ret = false;
-
- if (xpoweredBySetterCalled) {
- ret = this.xpoweredBy;
- } else {
- Host host = (Host) getParent();
- if (host != null) {
- ret = host.isXpoweredBy();
- }
- }
-
- return ret;
- }
-
-
- /**
- * Enables or disables the generation of an X-Powered-By header (with value
- * Servlet/2.4) for all servlet-generated responses from this Context.
- *
- * @param xpoweredBy true if generation of X-Powered-By response header is
- * to be enabled, false otherwise
- */
- public void setXpoweredBy(boolean xpoweredBy) {
- boolean oldXpoweredBy = this.xpoweredBy;
- this.xpoweredBy = xpoweredBy;
- support.firePropertyChange("xpoweredBy",
- new Boolean(oldXpoweredBy),
- new Boolean(this.xpoweredBy));
- this.xpoweredBySetterCalled = true;
}
1.21 +1 -32
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
Index: StandardHost.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StandardHost.java 21 Jul 2003 19:05:51 -0000 1.20
+++ StandardHost.java 22 Jul 2003 21:01:26 -0000 1.21
@@ -218,12 +218,6 @@
private boolean xmlNamespaceAware = false;
- /*
- * Enables/disables generation of X-Powered-By response header
- */
- private boolean xpoweredBy;
-
-
// ------------------------------------------------------------- Properties
@@ -559,31 +553,6 @@
public void setWorkDir(String workDir) {
this.workDir = workDir;
- }
-
-
- /**
- * Indicates whether the generation of an X-Powered-By response header for
- * servlet-generated responses is enabled or disabled for this Host.
- *
- * @return true if generation of X-Powered-By response header is enabled,
- * false otherwise
- */
- public boolean isXpoweredBy() {
- return xpoweredBy;
- }
-
-
- /**
- * Enables or disables the generation of an X-Powered-By header (with value
- * Servlet/2.4) for all servlet-generated responses from contexts
- * registered with this Host.
- *
- * @param xpoweredBy true if generation of X-Powered-By response header is
- * to be enabled, false otherwise
- */
- public void setXpoweredBy(boolean xpoweredBy) {
- this.xpoweredBy = xpoweredBy;
}
1.19 +1 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- StandardWrapperValve.java 22 Jul 2003 18:51:21 -0000 1.18
+++ StandardWrapperValve.java 22 Jul 2003 21:01:26 -0000 1.19
@@ -244,9 +244,6 @@
// Call the filter chain for this request
// NOTE: This also calls the servlet's service() method
try {
- if (request.getContext().isXpoweredBy()) {
- hres.addHeader("X-Powered-By", "Servlet/2.4");
- }
String jspFile = wrapper.getJspFile();
if (jspFile != null)
hreq.setAttribute(Globals.JSP_FILE_ATTR, jspFile);
1.19 +0 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
Index: mbeans-descriptors.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mbeans-descriptors.xml 21 Jul 2003 19:05:51 -0000 1.18
+++ mbeans-descriptors.xml 22 Jul 2003 21:01:26 -0000 1.19
@@ -111,10 +111,6 @@
description="Should we allow the ServletContext.getContext() method
to access the context of other web applications in this server?"
type="boolean"/>
- <attribute name="xpoweredBy"
- description="Enables/disables X-Powered-By header for
servlet-generated responses"
- type="boolean"/>
-
<attribute name="debug"
description="The debugging detail level for this component"
type="int"/>
@@ -483,10 +479,6 @@
description="Attribute value used to turn on/off XML validation"
type="boolean"/>
- <attribute name="xpoweredBy"
- description="Enables/disables X-Powered-By header for
servlet-generated responses"
- type="boolean"/>
-
<attribute name="children"
description="Object names of all children"
type="[Ljavax.management.ObjectName;"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
