mturk 2004/11/29 23:35:37 Modified: jk/xdocs changelog.xml faq.xml index.xml jk/xdocs/config apache.xml jk/xdocs/install apache2.xml Log: Update docs with latest changes to source. Revision Changes Path 1.2 +30 -3 jakarta-tomcat-connectors/jk/xdocs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changelog.xml 25 Nov 2004 10:10:26 -0000 1.1 +++ changelog.xml 30 Nov 2004 07:35:37 -0000 1.2 @@ -22,21 +22,48 @@ </p> </section> -<section name="JK 1"> +<section name="Changes from JK 1.2.6"> <br /> <subsection name="Native"> <changelog> <update> + Added new property named recover_time that can be used to change the + default 60 second recover time. (mturk)
+ </update> + <update> + Added custom retries for worker, so we don't depend on default setting. + If set to a number grater then 3, it will sleep for 100ms on retry greater + then 3 and then try again. (mturk) + </update> + <update> + Added JkWorkerProperty directive that enables omiting workers.properties file. + For example: JkWorkerProperty worker.ajp13a.port=8009. (mturk) + </update> + <fix> + Check all JSESSIONID cookies for a valid jvmRoute. If you have multiple Tomcats + with overlapping domains, then you can get multiple cookies without a defined order. + This will route correctly as long as the different domains don't have any + Tomcats in common. (billbarker) + </fix> + <update> + Added JkUnMount directive for negative mappings that works as opposite to JkMount directives. + It is used for blocking of particular URL or content type. (mturk) + </update> + <update> + Added wildchar match uri mappings. One can now use JkMount to + map /app/*/servlet/* or /app?/*/*.jsp. (mturk) + </update> + <update> Rewrite the logging by adding Trace options. (mturk) </update> <update> Added socket_timeout property that sets the timeout for the socket itself. (mturk) </update> - <update> + <fix> Changed socket_timeout property to recycle_timeout. This better explains what the directive actually does. (mturk) - </update> + </fix> <fix> Changed the load balancer algorithm. The idea behind this new scheduler is the following: 1.12 +3 -2 jakarta-tomcat-connectors/jk/xdocs/faq.xml Index: faq.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/faq.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- faq.xml 18 Nov 2004 18:27:48 -0000 1.11 +++ faq.xml 30 Nov 2004 07:35:37 -0000 1.12 @@ -66,9 +66,10 @@ </subsection> <subsection name="What's the difference between JK and mod_jk ?"> +<br /> <p> <b>JK</b> is a project covering web-servers to Tomcat connectors, -whereas <b>mod_jk</b> is the <a href="jk/aphowto.html">Apache module</a> developped in JK. +whereas <b>mod_jk</b> is the <a href="howto/apache.html">Apache module</a> developped in JK. </p> <p> 1.24 +6 -0 jakarta-tomcat-connectors/jk/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/index.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- index.xml 29 Nov 2004 10:51:03 -0000 1.23 +++ index.xml 30 Nov 2004 07:35:37 -0000 1.24 @@ -28,6 +28,12 @@ <section name="Headlines"> <br /> <ul> +<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> +</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. 1.2 +19 -7 jakarta-tomcat-connectors/jk/xdocs/config/apache.xml Index: apache.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/config/apache.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apache.xml 18 Nov 2004 18:28:54 -0000 1.1 +++ apache.xml 30 Nov 2004 07:35:37 -0000 1.2 @@ -28,12 +28,13 @@ <attribute name="JkLogFile" required="false"><p> Full or server relative path to the Jakarta Tomcat Connector module log file </p></attribute> -<attribute name="JkAutoMount" required="false"><p> -Automatic mount points to a Tomcat worker -</p></attribute> <attribute name="JkMount" required="false"><p> A mount point from a context to a Tomcat worker </p></attribute> +<attribute name="JkUnMount" required="false"><p> +A no mount point from a context to a Tomcat worker +This directive is available in jk1.2.7 version and later. +</p></attribute> <attribute name="JkMountCopy" required="false"><p> Should the base server mounts be copied to the virtual server. </p></attribute> @@ -324,14 +325,12 @@ If you have created a custom or local version of mod_jk.conf-local as noted above, you can change settings such as the workers or URL prefix. </p> - <p> <b>JkMount</b> directive assign specific URLs to Tomcat. In general the structure of a JkMount directive is: </p> -<source> - +<source> JkMount [URL prefix] [Worker name] </source> @@ -345,8 +344,21 @@ </source> <p> -You can use the JkMount directive at the top level or inside <VirtualHost> sections of your httpd.conf file. +You can use the JkMount directive at the top level or inside <VirtualHost> +sections of your httpd.conf file. </p> +<p><b>JkUnmount</b> directive acts as an opposite to JkMount and blocks access +to a particular URL. The purpose is to be able to filter out the particular content +types from mounted context. The following example mounts /servlet/* +context, but all .jpg files that belongs to that context are not served. +</p> +<source> + # send all requests ending with /servlet to worker1 + JkMount /servlet/* worker1 + # do not send requests ending with .gif to worker1 + JkUnMount /servlet/*.gif worker1 +</source> + </subsection> </section> </body> 1.3 +2 -2 jakarta-tomcat-connectors/jk/xdocs/install/apache2.xml Index: apache2.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/install/apache2.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apache2.xml 22 Nov 2004 17:36:03 -0000 1.2 +++ apache2.xml 30 Nov 2004 07:35:37 -0000 1.3 @@ -39,10 +39,10 @@ <subsection name="Using configure to build mod_jk"> <p>The configure file produced using buildconf script will create all necesary make files. Here's how to use configure to prepare mod_jk for building, just type: -<source> +<screen> <read /> <type>./configure [autoconf arguments] [jakarta-tomcat-connectors arguments]</type> -</source> +</screen> </p> <p> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]