markt 2005/04/14 12:02:52 Modified: webapps/tomcat-docs/config connectors.xml coyote.xml jk.xml jk2.xml project.xml webapps/tomcat-docs project.xml Log: Fix bug 33768. Connector docs for Tc 4.1.x are out of date. Revision Changes Path 1.4 +39 -27 jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml Index: connectors.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/connectors.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- connectors.xml 17 Mar 2003 09:51:43 -0000 1.3 +++ connectors.xml 14 Apr 2005 19:02:52 -0000 1.4 @@ -17,34 +17,39 @@ <section name="Introduction"> <p> -JTC means Jakarta-Tomcat-Connectors. jakarta-tomcat-connectors is the -repository of the Tomcat connectors sources. -The connectors are released together with Tomcat. For example you can find -the connectors sources in -http://jakarta.apache.org/builds/jakarta-tomcat-4.x/release/v4.x.y/src/ -The tarball are named like: -jakarta-tomcat-connectors-4.x.y-src.tar.gz +JTC stands for Jakarta Tomcat Connectors. </p> <p> There are two different types of connectors. Connectors that allow browsers to connect directly to the Tomcat and connectors that do it through a Web Server. </p> <p> -The connectors allowing direct connections are in the binary of Tomcat. -They are jar files. +The connectors allowing direct connections are distributed as jar files with +the Tomcat binary releases. </p> <p> The connectors used with a Web Server are made of 2 components. One written -in Java and the other written in C. The Java part is made of jar files are -inclosed in the Tomcat binaries. -</p> -<p> -The binary builds of connectors are available in -http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.x.y/bin/plaform. -For example the Apache Solaris8 *.so files for SPARC will be in the -solaris8/sparc subdirectory. (Do not hesitate to ask for the binary needed for -your platform to the Tomcat mail lists, but be patient). +in Java and the other written in C. The Java part is included, as a jar file , + +with the Tomcat binary releases. The C part is released separately and may be +obtained from the +<a href="http://jakarta.apache.org/site/downloads/downloads_tomcat-connectors.cgi"> +Tomcat Connectors Downloads</a>. +</p> +<p> +The total number of different operating systems and web servers is sufficiently +large that it is not practical to provide binaries downloads for every +combination. Binaries are provided for most of the popular combinations and if +the one you need is not avaialble do not hesitate to ask for it on the +tomcat-user mailing list but please be patient and accept you may have to build +it yourself with the help of the mialing list. +</p><p> +The CVS repository for JTC is called jakarta-tomcat-connectors and source +bundles (that include both the Java and the C components) are available from +<a href="http://jakarta.apache.org/site/downloads/downloads_tomcat-connectors.cgi"> +Tomcat Connectors Downloads</a>. </p> + </section> <section name="Tomcat connectors"> @@ -58,17 +63,17 @@ <tr><td>Ancient browser</td><td>HTTP/1.0</td> <td>org.apache.catalina.connector.http10.HttpConnector</td> - <td>Deprecated. See <a href="http11.html"> HTTP/1.1</a></td> + <td>Deprecated<br/>See <a href="http11.html"> HTTP/1.1</a></td> </tr> <tr><td>Modern browser</td><td>HTTP/1.1</td> <td>org.apache.catalina.connector.http.HttpConnector</td> - <td>Deprecated. See <a href="http11.html"> HTTP/1.1</a></td> + <td>Deprecated<br/>See <a href="http11.html"> HTTP/1.1</a></td> </tr> <tr><td>Modern browser</td><td>HTTP/1.1</td> <td>org.apache.coyote.tomcat4.CoyoteConnector</td> - <td>Current practice. See <a href="coyote.html"> Coyote HTTP/1.1</a> + <td>Current practice<br/>See <a href="coyote.html"> Coyote HTTP/1.1</a> </td> </tr> @@ -79,37 +84,44 @@ <tr> <td>mod_jserv</td><td>AJP/1.2</td> <td>Ajp11</td> - <td>Obsolete Read more at + <td>Obsolete<br/>Read more at <a href="http://java.apache.org/jserv/index.html"> JServ</a></td> </tr> <tr> <td>mod_jk</td><td>AJP/1.3</td> <td>CoyoteConnector with JkCoyoteHandler</td> - <td>mod_jk supports load balancing. Enabled by default in 4.1; - works in 4.0. See <a href="jk2.html">Coyote JK 2</a> + <td>Current<br/>mod_jk supports load balancing. + Enabled by default in 4.1; works in 4.0. See <a href="jk.html">Coyote JK</a> </td> </tr> <tr> <td>mod_jk2</td><td>AJP/1.3</td> <td>CoyoteConnector with JkCoyoteHandler</td> - <td>Currently developed native connector. Enabled by default in 4.1. + <td>Deprecated<br/>Enabled by default in 4.1. mod_jk2 supports in-process JVM and load balancing. - See <a href="jk2.html">Coyote JK 2</a> + See <a href="jk.html">Coyote JK</a> </td> </tr> <tr> <td>mod_webapp</td><td>WARP/1.0</td> <td>WarpConnector</td> - <td>Deprecated. Not for Win32; no in-process nor load balancing; + <td>Deprecated<br/>Not for Win32; no in-process nor load balancing; works in 4.x. Use <a href="http://apr.apache.org/">APR</a>. Supported Apache-2.0 and Apache-1.3). See <a href="webapp.html">Webapp</a> </td> </tr> +<tr> + <td>mod_proxy with AJP enabled</td><td>AJP/1.3</td> + <td>CoyoteConnector with JkCoyoteHandler</td> + <td>Current<br/>Available for Apache httd 2.x and included by default with + 2.2. See <a href="jk.html">Coyote JK</a> + </td> +</tr> </table> </section> <section name="Why a Tomcat connector with a native Web Server?"> 1.10 +2 -3 jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml Index: coyote.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/coyote.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- coyote.xml 25 Jan 2004 13:15:16 -0000 1.9 +++ coyote.xml 14 Apr 2005 19:02:52 -0000 1.10 @@ -27,9 +27,8 @@ request processing and create the response.</p> <p>If you wish to configure the <strong>Connector</strong> that is used - for connections to web servers using the WARP protocol (such as the - <code>mod_webapp</code> connector for Apache 1.3), see - <a href="webapp.html">here</a> instead.</p> + for connections to web servers using the AJP protocol (such as the + <code>JK</code> connector), see <a href="jk.html">here</a> instead.</p> <p>At server startup time, this <strong>Connector</strong> will create a number of request processing threads (based on the value configured for 1.12 +4 -6 jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk.xml Index: jk.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jk.xml 12 Jan 2003 17:26:48 -0000 1.11 +++ jk.xml 14 Apr 2005 19:02:52 -0000 1.12 @@ -16,9 +16,6 @@ <section name="Introduction"> - <p><b>IMPORTANT NOTE: The JK connector is now deprecated. Use the - Coyote JK 2 connector instead.</b></p> - <p>The <strong>JK Connector</strong> element represents a <strong>Connector</strong> component that communicates with a web connector via the <code>JK</code> protocol (also known as the AJP protocol). @@ -27,9 +24,10 @@ the static content contained in the web application, and/or utilize Apache's SSL processing. In many application environments, this will result in better overall performance than running your applications under - Tomcat stand-alone using the <a href="http11.html">HTTP/1.1 Connector</a>. - However, the only way to know for sure whether it will provide better - performance for <strong>your</strong> application is to try it both ways.</p> + Tomcat stand-alone using the <a href="coyote.html">Coyote HTTP/1.1 + Connector</a>. However, the only way to know for sure whether it will + provide better performance for <strong>your</strong> application is to try + it both ways.</p> <p>This connector supports load balancing when used in conjunction with the <code>jvmRoute</code> attribute of the 1.9 +4 -0 jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk2.xml Index: jk2.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/jk2.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jk2.xml 25 Jan 2004 13:15:16 -0000 1.8 +++ jk2.xml 14 Apr 2005 19:02:52 -0000 1.9 @@ -16,6 +16,10 @@ <section name="Introduction"> + <p><b>IMPORTANT NOTE: The Coyote JK 2 connector is now deprecated. Use the + JK connector instead or, for Apache http 2.x only, use mod_proxy with AJP + enabled.</b></p> + <p>The <strong>JK 2 Connector</strong> element represents a <strong>Connector</strong> component that communicates with a web connector via the <code>AJP</code> protocol. This is used for cases 1.12 +2 -2 jakarta-tomcat-4.0/webapps/tomcat-docs/config/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/config/project.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- project.xml 22 Jun 2002 16:19:45 -0000 1.11 +++ project.xml 14 Apr 2005 19:02:52 -0000 1.12 @@ -24,9 +24,9 @@ <menu name="Connectors"> <item name="JTC Connectors" href="connectors.html"/> <item name="Coyote HTTP/1.1" href="coyote.html"/> - <item name="Coyote JK 2" href="jk2.html"/> - <item name="HTTP/1.1" href="http11.html"/> <item name="JK" href="jk.html"/> + <item name="HTTP/1.1" href="http11.html"/> + <item name="JK 2" href="jk2.html"/> <item name="Webapp" href="webapp.html"/> </menu> 1.21 +1 -1 jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/tomcat-docs/project.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- project.xml 3 Feb 2003 23:03:55 -0000 1.20 +++ project.xml 14 Apr 2005 19:02:52 -0000 1.21 @@ -31,7 +31,7 @@ <item name="Class Loader HOW-TO" href="class-loader-howto.html"/> <item name="Connectors List" href="config/connectors.html"/> <item name="HTML Manager App HOW-TO" href="html-manager-howto.html"/> - <item name="JK Documentation" href="jk2/index.html"/> + <item name="JK Documentation" href="config/jk.html"/> <item name="JNDI DataSource HOW-TO" href="jndi-datasource-examples-howto.html"/> <item name="JNDI Resources HOW-TO" href="jndi-resources-howto.html"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]