tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r479842 [1/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
Author: rjung
Date: Mon Nov 27 17:55:39 2006
New Revision: 479842

URL: http://svn.apache.org/viewvc?view=rev&rev=479842
Log:
Huge jk docs reorg.
All pages show now a more complete menu,
so that the available information is easier to find.
Fixed all links.
Updated and corrected smaller parts with outdated information.

Added:
    tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13a.xml
      - copied unchanged from r479836, tomcat/connectors/trunk/jk/xdocs/common/ajpv13a.xml
    tomcat/connectors/trunk/jk/xdocs/ajp/ajpv13ext.xml
      - copied unchanged from r479836, tomcat/connectors/trunk/jk/xdocs/common/ajpv13ext.xml
    tomcat/connectors/trunk/jk/xdocs/ajp/project.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/common/project.xml
    tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/loadbalancers.xml
    tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/project.xml
    tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/quick.xml
    tomcat/connectors/trunk/jk/xdocs/generic_howto/workers.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/workers.xml
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
      - copied unchanged from r479836, tomcat/connectors/trunk/jk/xdocs/changelog.xml
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/doccontrib.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/doccontrib.xml
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/faq.xml
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/tools/project.xml
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/tools.xml
      - copied unchanged from r479836, tomcat/connectors/trunk/jk/xdocs/tools/tools.xml
    tomcat/connectors/trunk/jk/xdocs/webserver_howto/apache.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/apache.xml
    tomcat/connectors/trunk/jk/xdocs/webserver_howto/iis.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/iis.xml
    tomcat/connectors/trunk/jk/xdocs/webserver_howto/nes.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/howto/nes.xml
    tomcat/connectors/trunk/jk/xdocs/webserver_howto/project.xml
      - copied, changed from r479836, tomcat/connectors/trunk/jk/xdocs/project.xml
Removed:
    tomcat/connectors/trunk/jk/xdocs/changelog.xml
    tomcat/connectors/trunk/jk/xdocs/common/
    tomcat/connectors/trunk/jk/xdocs/faq.xml
    tomcat/connectors/trunk/jk/xdocs/howto/
    tomcat/connectors/trunk/jk/xdocs/tools/
Modified:
    tomcat/connectors/trunk/jk/xdocs/build.xml
    tomcat/connectors/trunk/jk/xdocs/config/project.xml
    tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml
    tomcat/connectors/trunk/jk/xdocs/config/workers.xml
    tomcat/connectors/trunk/jk/xdocs/index.xml
    tomcat/connectors/trunk/jk/xdocs/news/20041100.xml
    tomcat/connectors/trunk/jk/xdocs/news/20050101.xml
    tomcat/connectors/trunk/jk/xdocs/news/20060101.xml
    tomcat/connectors/trunk/jk/xdocs/news/project.xml
    tomcat/connectors/trunk/jk/xdocs/project.xml

Copied: tomcat/connectors/trunk/jk/xdocs/ajp/project.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/common/project.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/ajp/project.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/common/project.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/ajp/project.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/common/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/ajp/project.xml Mon Nov 27 17:55:39 2006
@@ -1,22 +1,56 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Application Developer's Guide"
+<project name="Apache Tomcat Connector Documentation - AJP Protocol Reference"
         href="http://tomcat.apache.org/">
 
-    <title>Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - AJP Protocol Reference</title>
 
     <logo href="/images/tomcat.gif">
-    Tomcat Connector
-    </logo>    
+      The Apache Tomcat Connector - AJP Protocol Reference
+    </logo>
 <body>
 
     <menu name="Links">
-        <item name="Docs Home"             href="../index.html"/>
+        <item name="Docs Home"                  href="../index.html"/>
     </menu>
 
-    <menu name="AJP Protocol">
-        <item name="AJPv13"                     href="ajpv13a.html"/>
-        <item name="AJPv13 extension Proposal"  href="ajpv13ext.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>
+</project>
\ No newline at end of file

Modified: tomcat/connectors/trunk/jk/xdocs/build.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/build.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/build.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/build.xml Mon Nov 27 17:55:39 2006
@@ -64,18 +64,18 @@
       <param name="project-menu" expression="nomenu"/>
     </style>
 
-    <!-- News -->
-    <style basedir="news"
-           destdir="${build.dir}/${dist.name}/news"
+    <!-- Configuration Reference -->
+    <style basedir="config"
+           destdir="${build.dir}/${dist.name}/config"
          extension=".html"
              style="style.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
     </style>
-    <mkdir     dir="${build.dir}/${dist.name}/news/printer"/>
-    <style basedir="news"
-           destdir="${build.dir}/${dist.name}/news/printer"
+    <mkdir     dir="${build.dir}/${dist.name}/config/printer"/>
+    <style basedir="config"
+           destdir="${build.dir}/${dist.name}/config/printer"
          extension=".html"
              style="style.xsl"
           excludes="project.xml"
@@ -84,18 +84,18 @@
       <param name="project-menu" expression="nomenu"/>
     </style>
 
-    <!-- Common -->
-    <style basedir="common"
-           destdir="${build.dir}/${dist.name}/common"
+    <!-- Generic Howto -->
+    <style basedir="generic_howto"
+           destdir="${build.dir}/${dist.name}/generic_howto"
          extension=".html"
              style="style.xsl"
           excludes="project.xml"
           includes="*.xml">
       <param name="relative-path" expression=".."/>
     </style>
-    <mkdir     dir="${build.dir}/${dist.name}/common/printer"/>
-    <style basedir="common"
-           destdir="${build.dir}/${dist.name}/common/printer"
+    <mkdir     dir="${build.dir}/${dist.name}/generic_howto/printer"/>
+    <style basedir="generic_howto"
+           destdir="${build.dir}/${dist.name}/generic_howto/printer"
          extension=".html"
              style="style.xsl"
           excludes="project.xml"
@@ -104,45 +104,85 @@
       <param name="project-menu" expression="nomenu"/>
     </style>
 
-    <!-- Howto -->
-    <style basedir="howto"
-           destdir="${build.dir}/${dist.name}/howto"
-         extension=".html"
-             style="style.xsl"
-          excludes="project.xml"
-          includes="*.xml">
-      <param name="relative-path" expression=".."/>
-    </style>
-    <mkdir     dir="${build.dir}/${dist.name}/howto/printer"/>
-    <style basedir="howto"
-           destdir="${build.dir}/${dist.name}/howto/printer"
-         extension=".html"
-             style="style.xsl"
-          excludes="project.xml"
-          includes="*.xml">
-      <param name="relative-path" expression="../.."/>
-      <param name="project-menu" expression="nomenu"/>
-    </style>
+        <!-- Webserver Howto -->
+        <style basedir="webserver_howto"
+               destdir="${build.dir}/${dist.name}/webserver_howto"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression=".."/>
+        </style>
+        <mkdir     dir="${build.dir}/${dist.name}/webserver_howto/printer"/>
+        <style basedir="webserver_howto"
+               destdir="${build.dir}/${dist.name}/webserver_howto/printer"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression="../.."/>
+          <param name="project-menu" expression="nomenu"/>
+        </style>
 
-    <!-- Config -->
-    <style basedir="config"
-           destdir="${build.dir}/${dist.name}/config"
-         extension=".html"
-             style="style.xsl"
-          excludes="project.xml"
-          includes="*.xml">
-      <param name="relative-path" expression=".."/>
-    </style>
-    <mkdir     dir="${build.dir}/${dist.name}/config/printer"/>
-    <style basedir="config"
-           destdir="${build.dir}/${dist.name}/config/printer"
-         extension=".html"
-             style="style.xsl"
-          excludes="project.xml"
-          includes="*.xml">
-      <param name="relative-path" expression="../.."/>
-      <param name="project-menu" expression="nomenu"/>
-    </style>
+        <!-- AJP Protocol Reference -->
+        <style basedir="ajp"
+               destdir="${build.dir}/${dist.name}/ajp"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression=".."/>
+        </style>
+        <mkdir     dir="${build.dir}/${dist.name}/ajp/printer"/>
+        <style basedir="ajp"
+               destdir="${build.dir}/${dist.name}/ajp/printer"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression="../.."/>
+          <param name="project-menu" expression="nomenu"/>
+        </style>
+
+        <!-- Miscellaneous Documentation -->
+        <style basedir="miscellaneous"
+               destdir="${build.dir}/${dist.name}/miscellaneous"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression=".."/>
+        </style>
+        <mkdir     dir="${build.dir}/${dist.name}/miscellaneous/printer"/>
+        <style basedir="miscellaneous"
+               destdir="${build.dir}/${dist.name}/miscellaneous/printer"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression="../.."/>
+          <param name="project-menu" expression="nomenu"/>
+        </style>
+
+        <!-- News -->
+        <style basedir="news"
+               destdir="${build.dir}/${dist.name}/news"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression=".."/>
+        </style>
+        <mkdir     dir="${build.dir}/${dist.name}/news/printer"/>
+        <style basedir="news"
+               destdir="${build.dir}/${dist.name}/news/printer"
+             extension=".html"
+                 style="style.xsl"
+              excludes="project.xml"
+              includes="*.xml">
+          <param name="relative-path" expression="../.."/>
+          <param name="project-menu" expression="nomenu"/>
+        </style>
  
   </target>
 

Modified: tomcat/connectors/trunk/jk/xdocs/config/project.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/project.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/project.xml Mon Nov 27 17:55:39 2006
@@ -1,22 +1,55 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Application Developer's Guide"
+<project name="Apache Tomcat Connector Documentation - Configuration Reference"
         href="http://tomcat.apache.org/">
 
-    <title>Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - Configuration Reference</title>
 
     <logo href="/images/tomcat.gif">
-    Tomcat Connector
-    </logo>    
+      The Apache Tomcat Connector - Configuration Reference
+    </logo>
 <body>
 
     <menu name="Links">
         <item name="Docs Home"                  href="../index.html"/>
     </menu>
-    <menu name="Configuration">
-        <item name="Workers.properties"    href="workers.html"/>
-        <item name="Uriworkermap.properties" href="uriworkermap.html"/>
-        <item name="Apache"                href="apache.html"/>
-        <item name="IIS"                   href="iis.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>

Modified: tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/uriworkermap.xml Mon Nov 27 17:55:39 2006
@@ -221,10 +221,10 @@
 <p>
 When a request is being processed, tomcat connectors check the file modification time
 of the uriworkermap file. To keep the performance penalty low, this happens only,
-if the last check happened at least 60 seconds ago.
+if the last check happened at least n seconds ago.
 </p>
 <p>
-For Apache you can configure the interval using the directive JkMountFile,
+For Apache you can configure the interval "n" using the directive JkMountFile,
 for IIS you would use the attribute worker_mount_reload.
 The default value is 60 seconds. A value of "0" turns off the reloading.
 </p>

Modified: tomcat/connectors/trunk/jk/xdocs/config/workers.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/config/workers.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/config/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/config/workers.xml Mon Nov 27 17:55:39 2006
@@ -105,7 +105,7 @@
 <p>AJP13 worker is the preferred worker type that JK uses for communication
 between web server and Tomcat. This type of worker uses sockets as communication
 channel. For detailed description of the AJP13 protocol stack browse to
-<a href="../common/ajpv13a.html">AJPv13 protocol specification</a>
+<a href="../ajp/ajpv13a.html">AJPv13 protocol specification</a>
 </p>
 </directive>
 </directives>
@@ -185,7 +185,7 @@
 <directive name="connection_pool_timeout" default="0" required="false">
 Cache timeout property should be used with <b>connection_pool_size</b> to specify how long JK should keep
 an inactive socket in cache before closing it. This property should be used to reduce the number of threads
-on the Tomcat WebServer. The default value zero disables the closing (infinite timeout).
+on the Tomcat web server. The default value zero disables the closing (infinite timeout).
 <p>
 Each child could open an ajp13 connection if it have to forward a request to Tomcat, creating
 a new ajp13 thread on Tomcat side.
@@ -682,7 +682,7 @@
 <warn>This directive has been deprecated since 1.2.16.</warn>
 Cache timeout property should be used with <b>cachesize</b> to specify how to time JK should keep
 an open socket in cache before closing it. This property should be used to reduce the number of threads 
-on the Tomcat WebServer.
+on the Tomcat web server.
 <p> 
 Each child could open an ajp13 connection if it have to forward a request to Tomcat, creating
 a new ajp13 thread on Tomcat side.

Copied: tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/loadbalancers.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/loadbalancers.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/loadbalancers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/loadbalancers.xml Mon Nov 27 17:55:39 2006
@@ -29,11 +29,14 @@
 <body>
 <section name="Introduction"> 
 <br/>
-<p>Load balancer is a virtual worker that does not really communicate with Tomcat workers.
+<p>A Load balancer is a virtual worker that does not really communicate with Tomcat workers.
 Instead it is responsible for the management of several "real" workers.
-The worker is supposed to be a load balancer if it's worker type is <b>lb</b>.
-See worker's <b>type</b> directive.
-<warn>The workers that are member of load balancer must not appear in the
+The worker is supposed to be a load balancer if its worker type is <b>lb</b>.
+See workers <b>type</b> directive. For a complete reference of all load balancer configuration
+items, please consult the worker <a href="../config/workers.html">reference</a>.
+The comprehensive status management features of the load balancer together with the status worker,
+makes its use an interesting option, even if only combined with a single "real" worker.
+<warn>The workers that are member of load balancer do not need to appear in the
 <b>worker.list</b> directive.</warn>
 </p>
 
@@ -66,9 +69,9 @@
 The following table specifies some properties that the lb worker can accept:
 <ul>
 <li><b>balance_workers</b> is a comma separated list of workers that the load balancer need to manage. 
-These workers should not appear in the worker.list property. This directive can be used multiple times for the same load balancer.</li>
+These workers do not need to appear in the worker.list property. This directive can be used multiple times for the same load balancer.</li>
 <li><b>sticky_session</b> specifies whether requests with SESSION ID's should be routed back to the same
-Tomcat worker. Set sticky_session to False when Tomcat is using a Session Manager which
+Tomcat worker. You can set sticky_session to False when Tomcat is using a Session Manager which
 can persist session data across multiple instances of Tomcat. By default sticky_session is set to True.</li>
 </ul>
 </p>

Copied: tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/project.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/project.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/project.xml Mon Nov 27 17:55:39 2006
@@ -1,31 +1,56 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Application Developer's Guide"
+<project name="Apache Tomcat Connector Documentation - Generic HowTo"
         href="http://tomcat.apache.org/">
 
-    <title>Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - Generic HowTo</title>
 
     <logo href="/images/tomcat.gif">
-    Tomcat Connector
-    </logo>    
+      The Apache Tomcat Connector - Generic HowTo
+    </logo>
 <body>
 
     <menu name="Links">
         <item name="Docs Home"                  href="../index.html"/>
     </menu>
-    <menu name="Generic Howto">
-        <item name="For the impatient"          href="quick.html"/>
-        <item name="All about workers"          href="workers.html"/>
-        <item name="Load Balancing"             href="loadbalancers.html"/>
-    </menu>
-    <menu name="Webservers">
-        <item name="Apache"                     href="apache.html"/>
-        <item name="IIS"                        href="iis.html"/>
-        <item name="Domino"                     href="domino.html"/>
-        <item name="SunOne (Netscape)"          href="nes.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="Get Involved">
-        <item name="Contribute documentation"    href="doccontrib.html"/>
+
+    <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>

Copied: tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/quick.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/quick.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/quick.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/quick.xml Mon Nov 27 17:55:39 2006
@@ -37,7 +37,7 @@
     is the same for all JK implementations (Apache/IIS/NES).
     </li>
     <li>
-    <b>WebServers</b> add-ons to be set on the webserver side. 
+    <b>web server</b> add-ons to be set on the webserver side. 
     </li>
     </ul>
 </p>
@@ -66,7 +66,7 @@
 </p>
 </section>
 
-<section name="Minimum Apache WebServer configuration">
+<section name="Minimum Apache web server configuration">
 <p>
    Here is a minimun informations about Apache configuration, a 
    complete documentation is available in <a href="apache.html">Apache HowTo</a>.
@@ -141,16 +141,7 @@
 </p>
 </section>
 
-<section name="Minimum Domino WebServer configuration">
-<p>
-	A complete documentation is available in <a href="domino.html">Domino HowTo</a>.
-<todo>
-More informations to be added!
-</todo>
-</p>
-</section>
-
-<section name="Minimum IIS WebServer configuration">
+<section name="Minimum IIS web server configuration">
 <p>
 	A complete documentation is available in <a href="iis.html">IIS HowTo</a>.
 </p>
@@ -159,7 +150,7 @@
 </todo>
 </section>
 
-<section name="Minimum NES/iPlanet WebServer configuration">
+<section name="Minimum NES/iPlanet web server configuration">
 <p>
 	A complete documentation is available in <a href="nes.html">Netscape/iPlanet HowTo</a>.
 <todo>
@@ -171,7 +162,7 @@
 
 <section name="Test your configuration">
 <p>
-	(Re)start the Web server and browse to the <a href="http://localhost/examples/">http://localhost/examples/</a>
+	(Re)start the web server and browse to the <a href="http://localhost/examples/">http://localhost/examples/</a>
 </p>
 
 </section>

Copied: tomcat/connectors/trunk/jk/xdocs/generic_howto/workers.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/workers.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/generic_howto/workers.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/workers.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/generic_howto/workers.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/workers.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/generic_howto/workers.xml Mon Nov 27 17:55:39 2006
@@ -113,10 +113,9 @@
 </p>
 
 <p>
-<b>worker</b>. <b>worker name</b>.<b>type</b>=&lt;worker type&gt;
+<b>worker</b>.<b>worker name</b>.<b>type</b>=&lt;worker type&gt;
 Where worker name is the name assigned to the worker and the worker type is one of the four types defined 
-in the table (a worker name may not contain any space (a good naming convention for queue named should 
-follow the Java variable naming rules).
+in the table (a worker name may only contain any space the characters [a-zA-Z0-9\-_]).
 </p>
 
 <source>
@@ -149,7 +148,7 @@
 <subsection name="ajp12 Worker properties">
 <p><warn>
 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 and 5 and 5.5 and Tomcat 6.
 </warn></p> 
 <p>
 The ajp12 typed workers forward requests to out-of-process Tomcat workers 
@@ -161,16 +160,16 @@
 </p>
 
 <p>
-<b>host</b> property set the host where the Tomcat worker is listening for ajp12 requests.
+<b>host</b> property sets the host where the Tomcat worker is listening for ajp12 requests.
 </p>
 
 <p>
-<b>port</b> property set The port where the Tomcat worker is listening for ajp12 requests
+<b>port</b> property sets the port where the Tomcat worker is listening for ajp12 requests
 </p>
 
 <p>
 <b>lbfactor</b>property is used when working with a load balancer worker, this is the load-balancing factor for the worker.
-We'll see more on this in the lb worker section.
+We'll see more on this in the <a href="../generic_howto/loadbalancers.html">lb worker</a> section.
 </p>
 
 <source>
@@ -198,7 +197,7 @@
 </li>
 <li>
 ajpv13 reuses open sockets and leaves them open for future requests (remember when you've got a Firewall between your 
-WebServer and Tomcat).
+web server and Tomcat).
 </li>
 <li>
 ajpv13 has special treatment for SSL information so that the container can implement 
@@ -209,7 +208,7 @@
 </p>
 
 <p>
-You should note that Ajp13 is now the only out-process protocol supported by Tomcat 4.0.x, 4.1.x and 5.
+You should note that Ajp13 is now the only out-process protocol supported by Tomcat 4.0.x, 4.1.x, 5.0.x, 5.5.x and 6.
 </p>
 
 

Modified: tomcat/connectors/trunk/jk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/index.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/index.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/index.xml Mon Nov 27 17:55:39 2006
@@ -21,7 +21,7 @@
 
 </p>
 <p>Select one of the links from the navigation menu (to the left) to drill
-down to the more detailed documentation that is available.  Each available
+down to the more detailed documentation that is available. Each available
 manual is described in more detail below.</p>
 
 </section>
@@ -29,248 +29,143 @@
 <section name="Headlines">
 <br />
 <ul>
-<li><a href="news/20060101.html#20060917.1">17 September 2006 - <b>JK-1.2.19 released</b></a>
+<li><a href="news/20060101.html#20060928.1">28 November 2006 - <b>JK-1.2.20 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Connectors 1.2.19 Stable.
+of Tomcat Connectors 1.2.20 Stable.
 </p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz">JK 1.2.19 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz.asc">PGP signature</a>
+<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.tar.gz">JK 1.2.20 release sources</a>
+ | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.20/tomcat-connectors-1.2.20-src.tar.gz.asc">PGP signature</a>
 </p>
 <p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
 </p>
 </li>
-
-<li><a href="news/20060101.html#20060720.1">27 July 2006 - <b>JK-1.2.18 released</b></a>
+<li><a href="news/20060101.html#20060917.1">17 September 2006 - <b>JK-1.2.19 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Connectors 1.2.18 Stable.
+of Tomcat Connectors 1.2.19 Stable.
 </p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.18/tomcat-connectors-1.2.18-src.tar.gz">JK 1.2.18 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.18/tomcat-connectors-1.2.18-src.tar.gz.asc">PGP signature</a>
+<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz">JK 1.2.19 release sources</a>
+ | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.19/tomcat-connectors-1.2.19-src.tar.gz.asc">PGP signature</a>
 </p>
 <p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
 </p>
 </li>
+</ul>
+</section>
 
-<li><a href="news/20060101.html#20060708.1"><b>JK-1.2.17 not released</b></a>
-<p>Version 1.2.17 of Tomcat Connectors has not been released due to a bug in socket function argument types.
+<section name="Configuration Reference">
+<br />
+<ul>
+<li><a href="config/workers.html"><b>workers.properties</b></a>
+<p>A Tomcat worker is a Tomcat instance that is waiting to execute servlets
+on behalf of some web server. For example, we can have a web server such as Apache
+forwarding servlet requests to a Tomcat process (the worker) running behind it. 
 </p>
-<p>Thanks to all testers for their feedback. All reported new errors have been fixed in Version 1.2.18.
+<p>This page contains detailed description of all workers.properties
+directives.
 </p>
 </li>
 
-<li><a href="news/20060101.html#20060629.1"><b>JK-1.2.16 not released</b></a>
-<p>Version 1.2.16 of Tomcat Connectors has not been released due to a bug in the jk status worker.
-</p>
-<p>Thanks to all testers for their feedback. All reported new errors have been fixed in Version 1.2.17.
+<li><a href="config/uriworkermap.html"><b>uriworkermap.properties</b></a>
+<p>
+The forwarding of requests from the web server to tomcat gets configured by defining mapping rules.
+The so-called <b>uriworkermap</b> file is a mechanism of defining those rules.
 </p>
 </li>
 
-<li><a href="news/20050101.html#20051108.1">8 November 2005 - <b>JK-1.2.15 released</b></a>
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.15 Stable.
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.15/jakarta-tomcat-connectors-1.2.15-src.tar.gz">JK 1.2.15 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.15/jakarta-tomcat-connectors-1.2.15-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
+<li><a href="config/apache.html"><b>Apache</b></a>
+<p>This page contains detailed description of all directives related to
+Apache web server. 
 </p>
 </li>
 
-<li><a href="news/20050101.html#20050713.1">13 July 2005 - <b>JK-1.2.14 released</b></a>
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.14 Stable.
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz">JK 1.2.14 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-1.2.14.1-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
+<li><a href="config/iis.html"><b>IIS</b></a>
+<p>This page contains detailed description of all IIS directives.
 </p>
 </li>
 
-<li><a href="news/20050101.html#20050516.1">16 May 2005 - <b>JK-1.2.13 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.13 tarbals for testing.
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.13/jakarta-tomcat-connectors-1.2.13-src.tar.gz">JK 1.2.13 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.13/jakarta-tomcat-connectors-1.2.13-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
-</p>
-</li>
-<li><a href="news/20050101.html#20050507.1">7 May 2005 - <b>JK-1.2.12 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.12.
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.12/jakarta-tomcat-connectors-1.2.12-src.tar.gz">JK 1.2.12 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.12/jakarta-tomcat-connectors-1.2.12-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
-</p>
-</li>
-<li><a href="news/20050101.html#20050429.1">29 April 2005 - <b>JK-1.2.11 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.11.
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.11/jakarta-tomcat-connectors-1.2.11-src.tar.gz">JK 1.2.11 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.11/jakarta-tomcat-connectors-1.2.11-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
-</p>
-</li>
-<li><a href="news/20050101.html#20050330.1">30 March 2005 - <b>JK-1.2.10 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.10.
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.10/jakarta-tomcat-connectors-1.2.10-src.tar.gz">JK 1.2.10 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.10/jakarta-tomcat-connectors-1.2.10-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
-</p>
-</li>
-<li><a href="news/20041100.html#20041224.1">24 December 2004 - <b>JK-1.2.8 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.8.
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.8/jakarta-tomcat-connectors-1.2.8-src.tar.gz">JK 1.2.8 release sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.8/jakarta-tomcat-connectors-1.2.8-src.tar.gz.asc">PGP signature</a>
-</p>
-<p>Download the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/">binaries</a> for selected platforms.
-</p>
-</li>
-<li><a href="news/20041100.html#20041218.1">17 December 2004 - <b>JK-1.2.8-rc-1 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.8-rc-1 (Relase Canditate 1).
-</p>
-<p>
-We expect it to be ratified as a Stable release when the vote takes place
-in the next week.
-</p> 
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.8-rc-1.tar.gz">JK 1.2.8 release candidate 1 sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.8-rc-1.tar.gz.asc">PGP signature</a>
-</p>
-</li>
-<li><a href="news/20041100.html#20041213.1">13 December 2004 - <b>JK-1.2.7-beta-3 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.7-beta-3. The release contains a fix to few configuraton
-problems detected with JK-1.2.7-beta-2 version. 
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-3.tar.gz">JK 1.2.7 beta sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-3.tar.gz.asc">PGP signature</a>
+</ul>
+</section>
+
+<section name="Generic HowTo">
+<br />
+<ul>
+
+<li><a href="generic_howto/quick.html"><b>Quick Start</b></a>
+<p>This page describes the configuration files used by JK on the
+Web Server side for the 'impatients'.
 </p>
 </li>
-<li><a href="news/20041100.html#20041207.1">7 December 2004 - <b>JK-1.2.7-beta-2 released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.7-beta-2. The release contains a fix to few compilation
-problems detected with JK-1.2.7-beta version. 
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-2.tar.gz">JK 1.2.7 beta sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-2.tar.gz.asc">PGP signature</a>
+<li><a href="generic_howto/workers.html"><b>All about workers</b></a>
+<p>This page contains an overview about the various aspects of defining
+and using workers.
 </p>
 </li>
-<li><a href="news/20041100.html#20041130.1">30 November 2004 - <b>JK-1.2.7-beta released</b></a>
-<p>The Apache Jakarta Tomcat team is proud to announce the immediate availability
-of Jakarta Tomcat Connectors 1.2.7-beta. The release contains a significant number
-of bug fixes and new features. 
-</p>
-<p>Downlad the <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-1.tar.gz">JK 1.2.7 beta sources</a>
- | <a href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jakarta-tomcat-connectors-1.2.7-beta-1.tar.gz.asc">PGP signature</a>
-</p>
-</li>
-<li><a href="news/20041100.html#20041115.1">15 November 2004 - <b>JK2 is officially unsupported!</b></a>
-<p>JK2 has been put in maintainer mode and no further development will take place.
-The reason for shutting down JK2 development was the lack of developers interest.
-Other reason was lack of users interest in adopting JK2, caused by configuration
-complexity when compared to JK.
-</p>
-<p>JK2 will have it's successor within core Apache2.1/2.2 distribution.
-We have developed new <b>proxy_ajp</b> that is an addition to
-the mod_proxy and uses Tomcat's AJP protocol stack. It is developped in httpd-2.1
-and integrated in it. We have also developed a new <b>proxy_balancer</b> module
-for load balancing http and ajp protocol stacks.
-</p>
-<p>JK will be fully supported for all other web servers. The next JK release is
-planned for the end of November. Lots of code from JK2 has been ported to JK
+<li><a href="generic_howto/loadbalancers.html"><b>Load Balancing</b></a>
+<p>This page contains an introduction on load balancing with JK.
 </p>
 </li>
+
 </ul>
 </section>
 
-<section name="Configuration">
+<section name="Webserver HowTo">
 <br />
-<ul>
-<li><a href="config/workers.html"><b>Workers.properties Documentation</b></a>
-<p>A Tomcat worker is a Tomcat instance that is waiting to execute servlets
-on behalf of some web server. For example, we can have a web server such as Apache
-forwarding servlet requests to a Tomcat process (the worker) running behind it. 
+<p>These pages contain detailed descriptions of how to build and
+install JK for the various web servers.
 </p>
-<p>This section contains detail description of all workers.properties
-directives.
-</p>
-</li>
+<ul>
 
-<li><a href="config/apache.html"><b>Apache Documentation</b></a>
-<p>This section contains detail description of all directives related to
-Aapache web server. 
-</p>
+<li><a href="webserver_howto/apache.html"><b>Apache</b></a>
 </li>
-<li><a href="config/iis.html"><b>IIS Documentation</b></a>
-<p>This section contains detail description of all IIS directives.
-</p>
+<li><a href="webserver_howto/iis.html"><b>IIS</b></a>
+</li>
+<li><a href="webserver_howto/nes.html"><b>Netscape/SunOne/Sun</b></a>
 </li>
 
 </ul>
 </section>
 
-<section name="HowTo and Install">
+<section name="AJP Protocol Reference">
 <br />
 <ul>
-
-<li><a href="howto/apache.html"><b>Apache HowTo and installation documentation</b></a>
-<p>This section contains a detailed description of how to build and
-install mod_jk for the Apache web server.
-</p>
-</li>
-<li><a href="howto/iis.html"><b>IIS HowTo and installation documentation</b></a>
-<p>This section contains a detailed description of how to build and
-install ISAPI redirector for the IIS web server.
+<li><a href="ajp/ajpv13a.html"><b>AJPv13</b></a>
+<p>This page describes the Apache JServ Protocol version 1.3 (hereafter
+<b>ajp13</b>). 
 </p>
 </li>
-<li><a href="howto/nes.html"><b>Netscape/SunOne/Sun web server HowTo and installation documentation</b></a>
-<p>This section contains a detailed description of how to build and
-install NSAPI redirector for the etscape/SunOne/Sun web server.
+<li><a href="ajp/ajpv13ext.html"><b>AJPv13 Extension Proposal</b></a>
+<p>This page describes an extension proposal for ajp13.
 </p>
 </li>
-
 </ul>
-</section>
 
+</section>
 
 <section name="Miscellaneous documentation">
 <br />
 <ul>
-<li><a href="common/ajpv13a.html"><b>AJPv13 Protocol Documentation</b></a>
-<p>This section describes the Apache JServ Protocol version 1.3 (hereafter
-<b>ajp13</b>). There is, apparently, no current documentation of how the
-protocol works. This document is an attempt to remedy that, in order to
-make life easier for maintainers of JK, and for anyone who wants to
-port the protocol to some other container. 
+<li><a href="miscellaneous/faq.html"><b>Frequently asked questions</b></a>
+<p>
 </p>
 </li>
-<li><a href="howto/index.html"><b>HowTo Documentation</b></a>
-<p>This section contains various howto documents General Informations and FAQ about JK 
+<li><a href="miscellaneous/changelog.html"><b>Changelog</b></a>
+<p>
+The FAQ detail the changes made in each version of JK.
 </p>
 </li>
-<li><a href="faq.html"><b>General Informations and FAQ about JK</b></a>
-<p>
+<li><a 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=">
+<b>Current Native:JK bugs</b></a>
+<p>This is the Bugzilla Bug List related to Native:JK.
 </p>
 </li>
-<li><a href="changelog.html"><b>Details the changes made to JK</b></a>
+<li><a href="miscellaneous/doccontrib.html"><b>Contribute documentation</b></a>
 <p>
+This page describes, how to contribute to the JK documentation.
 </p>
 </li>
-<li><a href="proxy.html"><b>Using ajp-proxy in httpd-2.1</b></a>
+<li><a href="miscellaneous/tools.html"><b>Tools</b></a>
 <p>
-mod-proxy in httpd-2.1 offers an AJP connection as well as load balancing.
+This page contains information, on some tool scripts contained in the Jk distribution.
 </p>
 </li>
 <li><a href="http://tomcat.apache.org/connectors-doc-archive/jk2/index.html">
@@ -278,15 +173,25 @@
 <p>Here you can find old JK and JK2 documentation.
 </p>
 </li>
-<li><a 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=">
-<b>Current Native:JK bugs</b></a>
-<p>This is Buzgilla Bug List related to Native:JK.
-</p>
-</li>
 </ul>
 
 </section>
 
+<section name="News">
+<br />
+<p>Release news from various years.
+</p>
+
+<ul>
+<li><a href="news/2006"><b>2006</b></a>
+</li>
+<li><a href="news/2006"><b>2005</b></a>
+</li>
+<li><a href="news/2006"><b>2004</b></a>
+</li>
+
+</ul>
+</section>
 
 </body>
 </document>

Copied: tomcat/connectors/trunk/jk/xdocs/miscellaneous/doccontrib.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/howto/doccontrib.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/doccontrib.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/howto/doccontrib.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/miscellaneous/doccontrib.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/howto/doccontrib.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/doccontrib.xml Mon Nov 27 17:55:39 2006
@@ -134,15 +134,22 @@
     You should see the ant compiler messages scrolling by rapidly and then stop 
 with the following:
 <screen>
-<read>[style] Transforming into C:\build\tomcat-connectors\jk\build\docs></read>
-<read>[style] Processing C:\build\tomcat-connectors\jk\xdocs\faq.xml 
+<read>[style] Transforming into C:\build\tomcat-connectors\jk\build\docs\news\printer></read>
+<read>[style] Processing C:\build\tomcat-connectors\jk\xdocs\news\20041100.xml 
 to</read>
-<read>C:\build\tomcat-connectors\jk\build\docs\faq.html</read>
+<read>C:\build\tomcat-connectors\jk\build\docs\news/20041100.html</read>
 <read>[style] Loading stylesheet C:\build\tomcat-connectors\jk\xdocs\style.xsl</read>
+<read>[style] Processing C:\build\tomcat-connectors\jk\xdocs\news\20050101.xml 
+to</read>
+<read>C:\build\tomcat-connectors\jk\build\docs\news/20050101.html</read>
+<read>[style] Processing C:\build\tomcat-connectors\jk\xdocs\news\20060101.xml 
+to</read>
+<read>C:\build\tomcat-connectors\jk\build\docs\news/20060101.html</read>
+<read>[style] Transforming into C:\build\tomcat-connectors\jk\build\docs></read>
 <read>[style] Processing C:\build\tomcat-connectors\jk\xdocs\index.xml 
 to</read>
 <read>C:\build\tomcat-connectors\jk\build\docs\index.html</read>
-<read>[copy] Copying 8 files to C:\build\tomcat-connectors\jk\build\docs</read>
+<read>[style] Loading stylesheet C:\build\tomcat-connectors\jk\xdocs\style.xsl</read>
 <read> </read>
 <read>BUILD SUCCESSFUL</read>
 <read>Total time: 10 seconds</read>

Copied: tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/faq.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/faq.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/faq.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/faq.xml Mon Nov 27 17:55:39 2006
@@ -67,21 +67,16 @@
 <br />
 <p>
 <b>JK</b> is a project covering web-servers to Tomcat connectors,
-whereas <b>mod_jk</b> is the <a href="howto/apache.html">Apache module</a> developed in JK.
+whereas <b>mod_jk</b> is the <a href="../webserver_howto/apache.html">Apache module</a> developed in JK.
 </p>
 
 <p>
-<a href="howto/domino.html">Domino webserver</a> support is implemented on JK, using a redirector
-called <b>dsapi redirector</b>.
-</p>
-
-<p>
-<a href="howto/iis.html">IIS webserver</a>support is implemented on JK, using a redirector
+<a href="../webserver_howto/iis.html">IIS webserver</a>support is implemented on JK, using a redirector
 called <b>isapi redirector</b>.
 </p>
 
 <p>
-<a href="howto/nes.html">Netscape/iPlanet webserver</a>webserver support is implemented on JK, using a redirector
+<a href="../webserver_howto/nes.html">Netscape/SunONE/Sun webserver</a>webserver support is implemented on JK, using a redirector
 called <b>nsapi redirector</b>.
 </p>
 
@@ -95,42 +90,40 @@
 <ul>
 
 <li>
-<a href="howto/quick.html">For the impatients</a>
+<a href="../generic_howto/quick.html">For the impatient</a>
 </li>
 
 <li>
-<a href="howto/apache.html">Apache and JK</a>
+<a href="../webserver_howto/apache.html">Apache and JK</a>
 </li>
 
 <li>
-<a href="howto/domino.html">Domino and JK</a>
+<a href="../webserver_howto/iis.html">IIS and JK</a>
 </li>
 
 <li>
-<a href="howto/iis.html">IIS and JK</a>
+<a href="../webserver_howto/nes.html">Netscape/SunONE/Sun and JK</a>
 </li>
 
 <li>
-<a href="howto/nes.html">Netscape/iPlanet and JK</a>
-</li>
-
-<li>
-<a href="howto/workers.html">Workers configuration</a>
+<a href="../generic_howto/workers.html">Workers configuration</a>
 </li>
 </ul>
 
 <p> 
+For more detailed information, have a look at the configuration reference pages.
 You could also try searching the mailing list archives for "JK" or look at the source.
 </p>
 </subsection>
 
 <subsection name="Which protocol should I use? Ajp12 or Ajp13?">
 <p>
-<a href="common/ajpv13a.html">Ajp13</a> is a newer protocol, it's faster, and it works better with SSL. 
+<a href="../ajp/ajpv13a.html">Ajp13</a> is a newer protocol, it's faster, and it works better with SSL. 
 You almost certainly want to use it now that <strong>ajp12 is deprecated</strong>.
 </p>
 <p> 
-Also ajp13 is supported by all Apache Tomcat including 3.2.x , 3.3.x, 4.0.x, 4.1.x and the new tomcat 5. 
+Also ajp13 is supported by all Apache Tomcat including 3.2.x , 3.3.x, 4.0.x, 4.1.x, 5.0.x, 5.5.x
+and the new tomcat 6. 
 </p>
 
 <p>
@@ -138,29 +131,32 @@
 </p>
 </subsection>
 
-<subsection name="I've got a firewall between my WebServer and Tomcat who drop ajp13 connections after some times">
+<subsection name="I've got a firewall between my web server and Tomcat which drops ajp13 connections after some time">
 <p>
-Ajp13 use persistant connections where the traffic could be null if there is no request to be sent to Tomcat. 
-Firewall used to drop inactive connections and will make your WebServer and Tomcat think the connection is valid. 
+Ajp13 uses persistant connections where the traffic could be null if there is no request to be sent to Tomcat. 
+Firewalls use to drop inactive connections and will make your web server and Tomcat think the connection is valid. 
 </p>
 <p>
 Starting with JK 1.2.0, a <b>socket_keepalive</b> property as been added to ajp13 settings, and you should take a look at 
-it in <a href="howto/workers.html">Workers HowTo</a>.
+it in <a href="../generic_howto/workers.html">Workers HowTo</a> and
+<a href="../config/workers.html">workers.properties reference</a>.
 If nothing else helps, you can try <b>JkOptions +DisableReuse</b>, but this will have strong performance implications.
 </p>
 </subsection>
 
-<subsection name="Under heavy load, I've got many threads in Tomcat even if my Apache Web Server handle much of the load">
+<subsection name="Under heavy load, I've got many threads in Tomcat even if my Apache Web Server handles much of the load">
 <p>
-Under heavy load, Apache WebServer create many childs to handle the load, which will in turn create many connections 
+Under heavy load, Apache Web Server creates many children to handle the load,
+which will in turn create many connections 
 to Tomcat to forward the requests they should handle. 
-Apache WebServer will normally kill the childs/threads when the load decrease. But if the load is still there and 
-even if only Apache handle the requests, ie static contents, the childs are kept and with them the ajp13 connections, 
+Apache Web Server will normally kill the children/threads when the load decreases.
+But if the load is still there and even if only Apache handles the requests,
+ie static contents, the children are kept and with them all the ajp13 connections, 
 even if they are no more used. 
 </p>
 <p>
 To close connections after some time of inactivity you can use <b>connection_pool_timeout</b>,
-for more informations refer to <a href="config/workers.html">workers.properties configuration</a>.
+for more informations refer to <a href="../config/workers.html">workers.properties reference</a>.
 </p>
 </subsection>
 
@@ -172,19 +168,20 @@
 </p>
 <subsection name="Whenever I restart Tomcat, Apache locks up!">
 <p>
-The Ajp13 protocol keeps an open socket between Tomcat and Apache. Release of mod_jk present in J-T-C handle the network failure. 
-But with previous release of mod_jk, you may have to restart Apache as well.
+The Ajp13 protocol keeps an open socket between Tomcat and Apache.
+Release of mod_jk present in J-T-C handles the network failure. 
+But with very ancient releases of mod_jk, you may have to restart Apache as well.
 </p>
 </subsection>
 
-<subsection name="Why did exist two files mod_jk.so (-eapi ad -noeapi) in download dir for Linux ?">
+<subsection name="Why do there exist two files mod_jk.so (-eapi ad -noeapi) in download directories for Apache 1.3?">
 <p>
-Many versions of Apache use of modified API, known at Extended API, developed for use with the
-<a href="http://www.modssl.org">mod_ssl module</a>.
+Many versions of Apache use a modified API, known at Extended API, developed for use with the
+<a href="http://www.modssl.org">mod_ssl module</a>. Starting with Apache 2.0 there is no more difference.
 </p>
 
 <p>
-For example, Apache present in certains recent Linux distributions include the
+For example, Apache 1.3 present in certains recent Linux distributions include the
 <b>mod_ssl</b> module.
 </p>
 
@@ -253,9 +250,21 @@
 </p>
 </subsection>
 
-<subsection name="JNI didn't works with Apache 1.3">
+<subsection name="Does it work for Apache 2.2?">
 <p>
-JNI support require a multi-threaded environment which is not the general case for Apache 1.3. 
+mod_jk works well with Apache 2.2. You need a binary module compiled for version 2.2 of the Apache web server.
+A binary compiled for version 2.0 will not work.
+</p>
+<p>
+Important parts of the functionality of mod_jk have been reimplemented as Apache httpd modules mod_proxy_ajp
+and mod_proxy_balancer. These are part of the standard distributoin of Apache 2.2. The new modules do not contain
+all features of mod_jk, but you get them automatically with every Apache 2.2.
+</p>
+</subsection>
+
+<subsection name="JNI doesn't work with Apache 1.3">
+<p>
+JNI support requires a multi-threaded environment which is not the general case for Apache 1.3. 
 You should verify if Apache 1.3 has been build with thread support and if not you could add the 
 the pthreads library to your <b>httpd.conf</b> file. 
 </p>
@@ -267,7 +276,7 @@
 
 <p>
 Also keep in mind that JNI is suited for multi-threaded servers and you should consider upgrading 
-to Apache 2.0 to support JNI.
+to Apache 2.x to support JNI.
 </p>
 </subsection>
 
@@ -297,44 +306,17 @@
 
 <subsection name="Mixed errors when building via configure">
 <p>
-configure assume you have some GNU tools allready installed and configured for your system, and ad minima <b>libtool</b>.
+configure assume you have some GNU tools already installed and configured for your system, and ad minima <b>libtool</b>.
 </p>
 <p>
 Also some systems may have mixed cc and gcc setup which may make you puzzled when trying to link an Apache built with native
 c compiler with a jk/jk2 build with gcc.
 </p>
 <p>
-In fine some native make didn't works as expect so you should use a GNU make <b>gmake</b>.
-</p>
-</subsection>
-
-<subsection name="JK2 build report error about missing FIONBIO on Solaris 8">
-<p>
-In JK2 before v2.0.2, you should add <source>#define BSD_COMP</source> in top
-of jk/native2/common/jk_channel_socket.c to have Solaris build succeed.
+In case the make processing doesn't work as expected, you should use a GNU make <b>gmake</b>.
 </p>
 </subsection>
 
-
 </section>
-
-<section name="IIS">
-<p>
-Informations and FAQ about JK and IIS Web Servers. 
-</p>
-<todo>
-More informations to be added.
-</todo>
-</section>
-
-<section name="NES/iPlanet">
-<p>
-Informations and FAQ about JK and NES/iPlanet Web Servers. 
-</p>
-<todo>
-More informations to be added.
-</todo>
-</section>
-
 </body>
 </document>

Copied: tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml (from r479836, tomcat/connectors/trunk/jk/xdocs/tools/project.xml)
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml?view=diff&rev=479842&p1=tomcat/connectors/trunk/jk/xdocs/tools/project.xml&r1=479836&p2=tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/tools/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/project.xml Mon Nov 27 17:55:39 2006
@@ -1,16 +1,55 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Application Developer's Guide"
+<project name="Apache Tomcat Connector Documentation - Miscellaneous Documentation"
         href="http://tomcat.apache.org/">
 
-    <title>Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - Miscellaneous Documentation</title>
 
     <logo href="/images/tomcat.gif">
-    Tomcat Connector
-    </logo>    
+      The Apache Tomcat Connector - Miscellaneous Documentation
+    </logo>
 <body>
 
     <menu name="Links">
-        <item name="Docs Home"             href="../index.html"/>
+        <item name="Docs Home"                  href="../index.html"/>
+    </menu>
+
+    <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>

Modified: tomcat/connectors/trunk/jk/xdocs/news/20041100.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20041100.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/news/20041100.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20041100.xml Mon Nov 27 17:55:39 2006
@@ -27,7 +27,7 @@
 of Jakarta Tomcat Connectors 1.2.8.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs during testing this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -45,7 +45,7 @@
 in the next week.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs during testing this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -64,7 +64,7 @@
 in the next week.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs during testing this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -84,7 +84,7 @@
 in the next two weeks.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs during testing this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -104,7 +104,7 @@
 in the next two weeks.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <warn>
 Since release 1.2.7 the <b>socket_timeout</b> property has been renamed to

Modified: tomcat/connectors/trunk/jk/xdocs/news/20050101.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20050101.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/news/20050101.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20050101.xml Mon Nov 27 17:55:39 2006
@@ -28,7 +28,7 @@
 few bug fixes found in 1.2.14 version.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -44,7 +44,7 @@
 few bug fixes found in 1.2.13 version.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -59,7 +59,7 @@
 few bug fixes found in 1.2.12 version.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -78,7 +78,7 @@
 in the next week.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -96,7 +96,7 @@
 This version has not been released.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -115,7 +115,7 @@
 in the next two weeks.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <warn>
 Since release 1.2.10 the <b>JkShmFile</b> property has been added for
@@ -139,7 +139,7 @@
 in the next two weeks.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <warn>
 Since release 1.2.9 the <b>JkShmFile</b> property has been added for

Modified: tomcat/connectors/trunk/jk/xdocs/news/20060101.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/20060101.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/news/20060101.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/20060101.xml Mon Nov 27 17:55:39 2006
@@ -15,6 +15,23 @@
 
 <section name="2006 News &amp; Status">
 <br />
+<a name="20060928.1"> 
+<h3>28 November - JK-1.2.20 released</h3>
+<p>The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.20. This is a stable release adding new features
+and a few bug fixes to version 1.2.19.
+Furthermore the documenation has been reorganised.
+</p>
+<p>
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
+</p>
+<p>If you find any bugs while using this release, please fill in the
+<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
+Bug Report. When entering bug select <b>Native:JK</b> Component.
+</p>
+</a>
+<hr size="1" noshade="noshade" />
+
 <a name="20060917.1"> 
 <h3>17 September - JK-1.2.19 released</h3>
 <p>The Apache Tomcat team is proud to announce the immediate availability
@@ -23,7 +40,7 @@
 Furthermore the non-functional code trees for isapi and domino have been removed.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -39,7 +56,7 @@
 a few bug fixes to the not released 1.2.17 version.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 <p>If you find any bugs while using this release, please fill in the
 <a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205">Bugzilla</a>
@@ -54,7 +71,7 @@
 due to a bug in the types chosen for socket arguments.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 </a>
 <hr size="1" noshade="noshade" />
@@ -67,7 +84,7 @@
 have been <a href="../config/workers.html">deprecated</a>.
 </p>
 <p>
- Please see the <a href="../changelog.html">ChangeLog</a> for a full list of changes.
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
 </p>
 </a>
 <hr size="1" noshade="noshade" />

Modified: tomcat/connectors/trunk/jk/xdocs/news/project.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/news/project.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/news/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/news/project.xml Mon Nov 27 17:55:39 2006
@@ -1,20 +1,56 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Tomcat Connector Documentation - Top Level Directory"
-        href="http://tomcat.apache.org/connector-docs/">
+<project name="Apache Tomcat Connector Documentation - News"
+        href="http://tomcat.apache.org/">
 
-    <title>Apache Tomcat Connector</title>
+    <title>The Apache Tomcat Connector - News</title>
 
     <logo href="/images/tomcat.gif">
-    Breaking News
+      The Apache Tomcat Connector - News
     </logo>
 <body>
 
     <menu name="Links">
-        <item name="Docs Home"             href="../index.html"/>
-        <item name="2006"                  href="20060101.html"/>
-        <item name="2005"                  href="20050101.html"/>
-        <item name="2004"                  href="20041100.html"/>
+        <item name="Docs Home"                  href="../index.html"/>
     </menu>
 
+    <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>

Modified: tomcat/connectors/trunk/jk/xdocs/project.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/project.xml?view=diff&rev=479842&r1=479841&r2=479842
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/project.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/project.xml Mon Nov 27 17:55:39 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Tomcat Connector Documentation - Top Level Directory"
+<project name="Apache Tomcat Connector Documentation"
         href="http://tomcat.apache.org/">
 
     <title>The Apache Tomcat Connector</title>
@@ -10,21 +10,46 @@
 <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>



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


Mime
View raw message