glenn 2002/08/29 22:41:13
Modified: catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
catalina/src/share/org/apache/catalina DefaultContext.java
Log:
Implement support for swallowOutput in DefaultContext.
Cleanup the default context docs and add swallowOutput.
useNaming was not in Context.java, just in the
Standard Implementation.
Removed useNaming from DefaultContext.java.
Updated docs so useNaming is listed as part of the
Standard Implementation.
Revision Changes Path
1.7 +33 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardDefaultContext.java 25 Jun 2002 22:29:23 -0000 1.6
+++ StandardDefaultContext.java 30 Aug 2002 05:41:13 -0000 1.7
@@ -197,6 +197,12 @@
/**
+ * The swallowOutput flag for this web application.
+ */
+ private boolean swallowOutput = false;
+
+
+ /**
* The set of classnames of LifecycleListeners that will be added
* to each newly created Wrapper by <code>createWrapper()</code>.
*/
@@ -367,6 +373,28 @@
/**
+ * Return the swallowOutput flag for this web application.
+ */
+ public boolean getSwallowOutput() {
+
+ return (this.swallowOutput);
+
+ }
+
+
+ /**
+ * Set the swallowOutput flag for this web application.
+ *
+ * @param swallowOutput The new swallowOutput flag
+ */
+ public void setSwallowOutput(boolean swallowOutput) {
+ boolean oldSwallowOutput = this.swallowOutput;
+ this.swallowOutput = swallowOutput;
+
+ }
+
+
+ /**
* Return the Java class name of the Wrapper implementation used
* for servlets registered in this Context.
*/
@@ -1293,6 +1321,7 @@
if (context instanceof StandardContext) {
((StandardContext)context).setUseNaming(isUseNaming());
+ ((StandardContext)context).setSwallowOutput(getSwallowOutput());
if (!contexts.containsKey(context)) {
((StandardContext) context).addLifecycleListener(this);
}
1.3 +4 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/DefaultContext.java
Index: DefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/DefaultContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultContext.java 9 Nov 2001 19:34:21 -0000 1.2
+++ DefaultContext.java 30 Aug 2002 05:41:13 -0000 1.3
@@ -91,18 +91,6 @@
/**
- * Returns true if the internal naming support is used.
- */
- public boolean isUseNaming();
-
-
- /**
- * Enables or disables naming.
- */
- public void setUseNaming(boolean useNaming);
-
-
- /**
* Return the "use cookies for session ids" flag.
*/
public boolean getCookies();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
