glenn 2002/08/29 22:41:41
Modified: webapps/tomcat-docs/config context.xml defaultcontext.xml
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.11 +7 -7 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- context.xml 28 Aug 2002 12:09:07 -0000 1.10
+++ context.xml 30 Aug 2002 05:41:40 -0000 1.11
@@ -149,13 +149,6 @@
on demand.</p>
</attribute>
- <attribute name="useNaming" required="false">
- <p>Set to <code>true</code> (the default) to have Catalina enable a
- JNDI <code>InitialContext</code> for this web application that is
- compatible with Java2 Enterprise Edition (J2EE) platform
- conventions.</p>
- </attribute>
-
<attribute name="wrapperClass" required="false">
<p>Java class name of the <code>org.apache.catalina.Wrapper</code>
implementation class that will be used for servlets managed by this
@@ -188,6 +181,13 @@
System.out and System.err by the web application will be redirected to
the web application logger. If not specified, the default value
of the flag is <code>false</code>.</p>
+ </attribute>
+
+ <attribute name="useNaming" required="false">
+ <p>Set to <code>true</code> (the default) to have Catalina enable a
+ JNDI <code>InitialContext</code> for this web application that is
+ compatible with Java2 Enterprise Edition (J2EE) platform
+ conventions.</p>
</attribute>
<attribute name="workDir" required="false">
1.4 +18 -11 jakarta-tomcat-4.0/webapps/tomcat-docs/config/defaultcontext.xml
Index: defaultcontext.xml
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/defaultcontext.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- defaultcontext.xml 30 Nov 2001 06:23:13 -0000 1.3
+++ defaultcontext.xml 30 Aug 2002 05:41:40 -0000 1.4
@@ -37,7 +37,7 @@
<subsection name="Common Attributes">
- <p>All implementations of <strong>Host</strong>
+ <p>All implementations of <strong>DefaultContext</strong>
support the following attributes:</p>
<attributes>
@@ -71,13 +71,6 @@
on demand.</p>
</attribute>
- <attribute name="useNaming" required="false">
- <p>Set to <code>true</code> (the default) to have Catalina enable a
- JNDI <code>InitialContext</code> for this web application that is
- compatible with Java2 Enterprise Edition (J2EE) platform
- conventions.</p>
- </attribute>
-
<attribute name="wrapperClass" required="false">
<p>Java class name of the <code>org.apache.catalina.Wrapper</code>
implementation class that will be used for servlets managed by this
@@ -97,6 +90,21 @@
common attributes listed above):</p>
<attributes>
+
+ <attribute name="swallowOutput" required="false">
+ <p>If the value of this flag is <code>true</code>, the bytes output to
+ System.out and System.err by the web application will be redirected to
+ the web application logger. If not specified, the default value
+ of the flag is <code>false</code>.</p>
+ </attribute>
+
+ <attribute name="useNaming" required="false">
+ <p>Set to <code>true</code> (the default) to have Catalina enable a
+ JNDI <code>InitialContext</code> for this web application that is
+ compatible with Java2 Enterprise Edition (J2EE) platform
+ conventions.</p>
+ </attribute>
+
</attributes>
</subsection>
@@ -105,9 +113,9 @@
</section>
+<!--
<section name="Nested Components">
-<!--
<p>You can nest at most one instance of the following utility components
by nesting a corresponding element inside your
<strong>DefaultContext</strong> element:</p>
@@ -136,10 +144,9 @@
resources associated with each web application. Normally, the
default configuration of the resource manager will be sufficient.</li>
</ul>
--->
</section>
-
+-->
<section name="Special Features">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
