tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r479842 [2/2] - in /tomcat/connectors/trunk/jk/xdocs: ./ ajp/ common/ config/ generic_howto/ howto/ miscellaneous/ news/ tools/ webserver_howto/
Date Tue, 28 Nov 2006 01:55:41 GMT
Copied: tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/apache.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/apache.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml Mon Nov 27 17:55:39 2006
@@ -36,8 +36,12 @@
 </p>
 
 <p>
-It is recommanded that you also read the <a href="workers.html">Workers HowTo</a>
document
-to learn how to setup the working entities between your WebServer and Tomcat Engines.
+It is recommended that you also read the <a href="workers.html">Workers HowTo</a>
document
+to learn how to setup the working entities between your web server and Tomcat Engines.
+For more detailed configuration information consult the reference documentation for
+<a href="../config/worker.html">workers.properties</a>,
+<a href="../config/uriworkermap.html">uriworkermap</a>
+and <a href="../config/apache.html">Apache</a>.
 </p>
 
 <p>
@@ -64,7 +68,7 @@
 </p>
 <p>
 In all the examples in this document ${tomcat_home} will be <b>/var/tomcat3</b>.
-A <a href="workers.html">worker</a> is defined to be a tomcat process that accepts
work from the Apache server.
+A <a href="../generic_howto/workers.html">worker</a> is defined to be a tomcat
process that accepts work from the Apache server.
 </p>
 </subsection>
 
@@ -89,7 +93,7 @@
 iSeries V5R1 and V5R2 with Apache 2.0.39. Be sure to have the latest Apache PTF installed.
 </li>
 <li>
-Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x and Tomcat 5
+Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x, Tomcat 5.0.x, Tomcat 5.5.x and Tomcat
6.
 </li>
 </ul>
 </p>
@@ -106,8 +110,8 @@
 </p>
 
 <p>
-The <b>ajp12</b> has been <b>deprecated</b> with Tomcat 3.3.x and
you should use instead
-<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and
5.
+The <b>ajp12</b> has been <b>deprecated</b> with Tomcat 3.3.x and
you should use instead 
+<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.x, 5 and 5.5 and
Tomcat 6.
 </p>
 
 <p>
@@ -187,7 +191,7 @@
 </p>
 
 <p>
-For example JK 1.2.5 can be downloaded from a mirror
+For example JK 1.2.x can be downloaded from a mirror
 <a href="http://tomcat.apache.org/download-connectors.cgi">
 here</a> (look for JK 1.2 Binary Releases). The "JK 1.2 Binary Releases" link contains
binary version for a variety of
 operating systems for both Apache 1.3 and Apache 2.
@@ -281,7 +285,7 @@
 </p>
 <ul>
 <li>
-You couldn't use <b>mod_jk.conf-auto</b> since Tomcat engine isn't on the same
machine that your Apache WebServer,
+You couldn't use <b>mod_jk.conf-auto</b> since Tomcat engine isn't on the same
machine that your Apache web server,
 ie when you have an Apache in front of a Tomcat Farm.
 </li>
 <li>

Copied: tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/iis.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/iis.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/iis.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml Mon Nov 27 17:55:39 2006
@@ -41,8 +41,12 @@
 </p>
 
 <p>
-It is recommanded that you also read the <a href="workers.html">Workers HowTo</a>
document
-to learn how to setup the working entities between your WebServer and Tomcat Engines.
+It is recommended that you also read the <a href="workers.html">Workers HowTo</a>
document
+to learn how to setup the working entities between your web server and Tomcat Engines.
+For more detailed configuration information consult the reference documentation for
+<a href="../config/worker.html">workers.properties</a>,
+<a href="../config/uriworkermap.html">uriworkermap</a>
+and <a href="../config/iis.html">IIS</a>.
 </p>
 
 
@@ -81,7 +85,7 @@
 IIS4.0 and PWS4.0 (numerous people have working IIS 5 and IIS 6 configurations)
 </li>
 <li>
-Tomcat 3.2 and later, Tomcat 4.x and Tomcat 5
+Tomcat 3.2 and later, Tomcat 4.x, Tomcat 5 and 5.5 and Tomcat 6
 </li>
 </ul>
 </p>
@@ -106,7 +110,7 @@
 
 <p>
 The <b>ajp12</b> has been <b>deprecated</b> with Tomcat 3.3.x and
you should use instead 
-<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.x and 5.
+<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.x, 5 and 5.5 and
Tomcat 6.
 </p>
 
 <p>
@@ -160,11 +164,11 @@
 <b>isapi_redirect.dll</b> - The IIS server plugin, either obtain a pre-built
DLL or build it yourself (see the build section).
 </li>
 <li>
-<b>workers.properties</b> - A file that describes the host(s) and port(s) used
by the workers (Tomcat processes). 
+<b><a href="../config/workers.html">workers.properties</a></b> -
A file that describes the host(s) and port(s) used by the workers (Tomcat processes). 
 A sample workers.properties can be found under the conf directory.
 </li>
 <li>
-<b>uriworkermap.properties</b> - A file that maps URL-Path patterns to workers.

+<b><a href="../config/uriworkermap.html">uriworkermap.properties</a></b>
- A file that maps URL-Path patterns to workers. 
 A sample uriworkermap.properties can be found under the conf directory as well.
 </li>
 </ul>
@@ -407,12 +411,12 @@
 
 <p>
 The above example defined two workers, now we can use these workers to serve two different
contexts 
-each with its own worker : 
+each with its own worker: 
 <source>
   example uriworkermap.properties fragment
   /examples/*=worker1
   /webpages/*=worker2
-</source>>
+</source>
 </p>
 
 <p>
@@ -421,7 +425,8 @@
 </p>
 
 <p>
-More informations on using and configuring workers in the <a href="workers.html">Workers
HowTO</a>
+More informations on using and configuring workers in the <a href="../generic_howto/workers.html">Workers
HowTo</a>
+and in the <a href="../config/workers.html">worker.properties configuration reference</a>.
 </p>
 
 </subsection>

Copied: tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/nes.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/nes.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/nes.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml Mon Nov 27 17:55:39 2006
@@ -42,8 +42,8 @@
 </p>
 
 <p>
-It is recommanded that you also read the <a href="workers.html">Workers HowTo</a>
document
-to learn how to setup the working entities between your WebServer and Tomcat Engines.
+It is recommended that you also read the <a href="../generic_howto/workers.html">Workers
HowTo</a> document
+to learn how to setup the working entities between your web server and Tomcat Engines.
 </p>
 
 
@@ -101,7 +101,7 @@
 
 <p>
 The <b>ajp12</b> has been <b>deprecated</b> with Tomcat 3.3.x and
you should use instead 
-<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and
5.
+<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x, 5.0.x,
5.5.x and 6.
 </p>
 
 <p>
@@ -403,7 +403,9 @@
 </source>
 
 <p>
-More informations on using and configuring workers in the <a href="workers.html">Workers
HowTO</a>
+More informations on using and configuring workers in the <a href="../generic_howto/workers.html">Workers
HowTo</a>
+and in the <a href="../config/workers.html">worker.properties configuration reference</a>.
+
 </p>
 </subsection>
 

Copied: tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/project.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/project.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml Mon Nov 27 17:55:39 2006
@@ -1,31 +1,56 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Tomcat Connector Documentation - Top Level Directory"
+<project name="Apache Tomcat Connector Documentation - Webserver HowTo"
         href="http://tomcat.apache.org/">
 
-    <title>The Apache Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - Webserver HowTo</title>
 
     <logo href="/images/tomcat.gif">
-      The Apache Tomcat Connector
+      The Apache Tomcat Connector - Webserver HowTo
     </logo>
 <body>
 
     <menu name="Links">
-        <item name="Docs Home"             href="index.html"/>
+        <item name="Docs Home"                  href="../index.html"/>
     </menu>
-    <menu name="Configuration">
-        <item name="Workers.properties"    href="config/workers.html"/>
-        <item name="Uriworkermap.properties" href="config/uriworkermap.html"/>
-        <item name="Apache"                href="config/apache.html"/>
-        <item name="IIS"                   href="config/iis.html"/>
-    </menu>
-    <menu name="Documentation">
-        <item name="AJPv13 Protocol"       href="common/ajpv13a.html"/>
-        <item name="HowTo and Install"     href="howto/index.html"/>
-        <item name="Frequently asked questions"  href="faq.html"/>
-        <item name="Changelog"             href="changelog.html"/>
-        <item name="Tools"             href="tools/tools.html"/>
-        <item name="Old JK/JK2 documentation" href="http://tomcat.apache.org/connectors-doc-archive/jk2/index.html"/>
+
+    <menu name="Configuration Reference">
+        <item name="Workers.properties"         href="../config/workers.html"/>
+        <item name="Uriworkermap.properties"    href="../config/uriworkermap.html"/>
+        <item name="Apache"                     href="../config/apache.html"/>
+        <item name="IIS"                        href="../config/iis.html"/>
+    </menu>
+
+    <menu name="Generic HowTo">
+        <item name="For the impatient"          href="../generic_howto/quick.html"/>
+        <item name="All about workers"          href="../generic_howto/workers.html"/>
+        <item name="Load Balancing"             href="../generic_howto/loadbalancers.html"/>
+    </menu>
+
+    <menu name="Webserver HowTo">
+        <item name="Apache"                     href="../webserver_howto/apache.html"/>
+        <item name="IIS"                        href="../webserver_howto/iis.html"/>
+        <item name="Netscape/SunOne/Sun"        href="../webserver_howto/nes.html"/>
     </menu>
 
+    <menu name="AJP Protocol Reference">
+        <item name="AJPv13"                     href="../ajp/ajpv13a.html"/>
+        <item name="AJPv13 Extension Proposal"  href="../ajp/ajpv13ext.html"/>
+    </menu>
+
+    <menu name="Miscellaneous Documentation">
+        <item name="Frequently asked questions" href="../miscellaneous/faq.html"/>
+        <item name="Changelog"                  href="../miscellaneous/changelog.html"/>
+        <item name="Current Native:JK bugs"     href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=Tomcat+5&amp;component=Native%3AJK&amp;long_desc_type=substring&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailassigned_to1=1&amp;emailtype1=substring&amp;email1=&amp;emailassigned_to2=1&amp;emailreporter2=1&amp;emailcc2=1&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0="/>
+        <item name="Contribute documentation"   href="../miscellaneous/doccontrib.html"/>
+        <item name="Tools"                      href="../miscellaneous/tools.html"/>
+        <item name="Old JK/JK2 documentation"   href="http://tomcat.apache.org/connectors-doc-archive/jk2/index.html"/>
+    </menu>
+
+    <menu name="News">
+        <item name="2006"                       href="../news/20060101.html"/>
+        <item name="2005"                       href="../news/20050101.html"/>
+        <item name="2004"                       href="../news/20041100.html"/>
+    </menu>
+    
 </body>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message