remm 2004/09/22 23:55:26
Modified: webapps/docs/config ajp.xml host.xml
webapps/docs balancer-howto.xml connectors.xml index.xml
tomcat-docs.xsl
Log:
- Docs updates, mostly to the connectors page.
Revision Changes Path
1.9 +9 -7 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml
Index: ajp.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ajp.xml 1 Sep 2004 22:04:29 -0000 1.8
+++ ajp.xml 23 Sep 2004 06:55:25 -0000 1.9
@@ -29,13 +29,15 @@
the <code>jvmRoute</code> attribute of the
<a href="engine.html">Engine</a>.</p>
- <p>On the native side, Tomcat 5.5 supports the following connectors:</p>
- <ul>
- <li>mod_jk 1.2.x with any of its supported native servers</li>
- <li>Apache httpd 2.2 with mod_proxy configured for AJP</li>
- </ul>
- <p>Other native connectors supporting AJP/1.3 may work, but are no longer
- supported.</p>
+<p>The native connectors supported with this Tomcat release are:
+<ul>
+<li>JK 1.2.x with any of the supported servers</li>
+<li>mod_proxy on Apache httpd 2.x (included by default in Apache HTTP Server 2.2),
+with AJP enabled</li>
+</ul>
+</p>
+
+<p><b>Other native connectors supporting AJP may work, but are no longer
supported.</b></p>
</section>
1.12 +8 -9 jakarta-tomcat-catalina/webapps/docs/config/host.xml
Index: host.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/host.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- host.xml 21 Sep 2004 02:08:55 -0000 1.11
+++ host.xml 23 Sep 2004 06:55:25 -0000 1.12
@@ -135,15 +135,14 @@
<attributes>
<attribute name="deployXML" required="false">
- <p>Set to <code>false</code> if you want to disable deploying
- applications using a Context XML config file. This also disables
- the ability to install web application directories or ".war" files
- with the manager app which are not located in the Host config base
- directory (<code>$CATALINA_HOME/conf/[engine_name]/[host_name]</code>).
- Applications are deployed with the security permissions
- of catalina, for security this may need to be set to <code>false</code>
- if untrusted users can manage web applications. The flag's value
- defaults to <code>true</code>.</p>
+ <p>Set to <code>false</code> if you want to disable parsing the context.xml
+ file embedded inside the application (located at
<code>/META-INF/context.xml</code>).
+ Security consious environments should set this to <code>false</code> to
prevent
+ applications from interacting with the container's configuration. The
+ administrator will then be responsible for providing an external context
+ configuration file, and put it in
+ <code>$CATALINA_HOME/conf/[enginename]/[hostname]/</code>.
+ The flag's value defaults to <code>true</code>.</p>
</attribute>
<attribute name="errorReportValveClass" required="false">
1.6 +6 -5 jakarta-tomcat-catalina/webapps/docs/balancer-howto.xml
Index: balancer-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/balancer-howto.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- balancer-howto.xml 1 Sep 2004 22:04:27 -0000 1.5
+++ balancer-howto.xml 23 Sep 2004 06:55:25 -0000 1.6
@@ -19,8 +19,8 @@
<p>
<a href="#Using the JK 1.2.x native connector">
Using the JK native connector</a><br />
-<a href="#Using Apache httpd 2.2 with mod_proxy">
-Using Apache httpd 2.2 and mod_proxy</a><br />
+<a href="#Using Apache HTTP Server 2.x with mod_proxy">
+Using Apache HTTP Server 2.x and mod_proxy</a><br />
<a href="#Using the balancer webapp">Using the balancer webapp</a><br />
</p>
</section>
@@ -31,11 +31,12 @@
</section>
-<section name="Using Apache httpd 2.2 with mod_proxy">
+<section name="Using Apache HTTP Server 2.x with mod_proxy">
-Please refer to the mod_proxy documentation for Apache 2.2. This supports either
+Please refer to the mod_proxy documentation for Apache HTTP Server 2.2. This
supports either
HTTP or AJP load balancing. This new version of mod_proxy is also useable with
-Apache httpd 2.0.
+Apache HTTP Server 2.0, but mod_proxy will have to be compiled separately using the
code
+from Apache HTTP Server 2.2.
</section>
1.2 +15 -26 jakarta-tomcat-catalina/webapps/docs/connectors.xml
Index: connectors.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/connectors.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- connectors.xml 1 Sep 2004 22:04:27 -0000 1.1
+++ connectors.xml 23 Sep 2004 06:55:25 -0000 1.2
@@ -21,49 +21,38 @@
</section>
-<section name="Standalone HTTP/1.1">
+<section name="HTTP">
-<p>The HTTP connector is setup by default with Tomcat, and is ready to use.</p>
+<p>The HTTP connector is setup by default with Tomcat, and is ready to use. This
+connector features the lowest latency and best overall performance.</p>
-</section>
-
-<section name="Clustered HTTP/1.1">
-
-<p>The HTTP connector is setup by default with Tomcat, and is ready to use. A HTTP
-load balancer <b>with support for web sessions stickiness</b> must be installed to
-direct the traffic to the Tomcat servers.</p>
-
-<p>
-Tomcat supports mod_proxy (included by default in Apache httpd 2.2) as the load
-balancer. This version of mod_proxy can also be used with Apache httpd 2.0. It
should
-be noted that the performance of HTTP proxying is usually lower than the performance
-of AJP, so AJP clustering is often preferable.
-</p>
+<p>For clustering, a HTTP load balancer <b>with support for web sessions
stickiness</b>
+must be installed to direct the traffic to the Tomcat servers. Tomcat supports
mod_proxy
+(on Apache HTTP Server 2.x, and included by default in Apache HTTP Server 2.2) as
the load balancer.
+It should be noted that the performance of HTTP proxying is usually lower than the
+performance of AJP, so AJP clustering is often preferable.</p>
</section>
-<section name="Standalone AJP">
+<section name="AJP">
<p>When using a single server, the performance when using a native webserver in
front of the Tomcat instance is most of the time significantly worse than a
standalone Tomcat with its default HTTP connector, even if a large part of the web
application is made of static files. If integration with the native webserver is
needed for any reason, an AJP connector will provide faster performance than
-proxied HTTP.</p>
+proxied HTTP. AJP clustering is the most efficient from the Tomcat perspective.
+It is otherwise functionally equivalent to HTTP clustering.</p>
<p>The native connectors supported with this Tomcat release are:
<ul>
-<li>mod_jk 1.2.x</li>
-<li>mod_proxy on Apache httpd 2.2, with AJP support</li>
+<li>JK 1.2.x with any of the supported servers</li>
+<li>mod_proxy on Apache HTTP Server 2.x (included by default in Apache HTTP Server
2.2),
+with AJP enabled</li>
</ul>
</p>
-</section>
-
-<section name="Clustered AJP">
-
-<p>AJP clustering is the most efficient from the Tomcat perspective. It is otherwise
-functionally equivalent to HTTP clustering.</p>
+<p><b>Other native connectors supporting AJP may work, but are no longer
supported.</b></p>
</section>
1.19 +2 -0 jakarta-tomcat-catalina/webapps/docs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/index.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- index.xml 1 Sep 2004 22:04:28 -0000 1.18
+++ index.xml 23 Sep 2004 06:55:25 -0000 1.19
@@ -95,6 +95,8 @@
Enable session replication in a Tomcat environment.</li>
<li><a href="balancer-howto.html"><strong>Balancer</strong></a> -
Configuring, using, and extending the load balancer application.</li>
+<li><a href="connectors.html"><strong>Connectors</strong></a> -
+ Connectors available in Tomcat, and native web server integration.</li>
</ol>
1.8 +2 -2 jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl
Index: tomcat-docs.xsl
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/tomcat-docs.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tomcat-docs.xsl 8 May 2004 22:33:22 -0000 1.7
+++ tomcat-docs.xsl 23 Sep 2004 06:55:25 -0000 1.8
@@ -159,7 +159,7 @@
<xsl:comment>PAGE FOOTER</xsl:comment>
<tr><td colspan="2">
<div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 1999-2003, Apache Software Foundation
+ Copyright © 1999-2004, Apache Software Foundation
</em></font></div>
</td></tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
