Author: rjung
Date: Sat Nov 24 08:50:39 2007
New Revision: 597880
URL: http://svn.apache.org/viewvc?rev=597880&view=rev
Log:
Document recent changes to status worker uri map listing
and JkMountCopy All.
Modified:
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
tomcat/connectors/trunk/jk/xdocs/reference/status.xml
tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=597880&r1=597879&r2=597880&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sat Nov 24
08:50:39 2007
@@ -43,6 +43,15 @@
<br />
<subsection name="Native">
<changelog>
+ <update>
+ JKStatus: Enhance URI to worker map listing for Apache httpd.
+ We now list maps for all virtual servers and not only
+ the one, in which JKStatus itself was called. (rjung)
+ </update>
+ <update>
+ JKStatus: Enhance URI to worker map listing.
+ Update stale uriworkermap.properties immediately. (rjung)
+ </update>
<fix>
<bug>43873</bug>: Fix small memory leak occuring during httpd restart.
(rjung)
</fix>
Modified: tomcat/connectors/trunk/jk/xdocs/reference/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/apache.xml?rev=597880&r1=597879&r2=597880&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/apache.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/apache.xml Sat Nov 24 08:50:39
2007
@@ -171,6 +171,9 @@
will only be inherited, if the VirtualHost does not define
it's own JkMountFile or JkAutoAlias.
<br/>
+If you want all vhost to inherit mounts from the main server,
+you can set JkMountCopy to 'All' in the main server.
+<br/>
This directive is only allowed inside VirtualHost.
<br/>
The default is Off.
Modified: tomcat/connectors/trunk/jk/xdocs/reference/status.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/status.xml?rev=597880&r1=597879&r2=597880&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/status.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/status.xml Sat Nov 24 08:50:39
2007
@@ -157,6 +157,9 @@
<subsection name="Special Considerations concerning URL Maps and Virtual
Hosts">
<br/>
<p>
+<b>Note: </b>The following restriction has been removed starting with version
1.2.26.
+</p>
+<p>
The Apache module mod_jk makes use of the internal Apache httpd infrastructure
concerning
virtual hosts. The downside of this is, that the status worker can only show
URL maps, for
the virtual host it is defined in. It is not able to reach the configuration
objects
Modified: tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml?rev=597880&r1=597879&r2=597880&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/uriworkermap.xml Sat Nov 24
08:50:39 2007
@@ -241,7 +241,8 @@
For Apache you can define individual uriworkermap files per virtual host.
The directive JkMountFile can be used in the main server and in each virtual
host.
If a virtual host does not use JkMountfile, but JkMountCopy is set to 'On',
-then it inhertis the JkMountFile from the main server.
+then it inherits the JkMountFile from the main server. If you want all vhost
to inherit
+mounts from the main server, you can set JkMountCopy to 'All' in the main
server.
</p>
</subsection>
</section>
@@ -277,22 +278,43 @@
<p>
The configuration view of the status worker also shows the various mapping
rules.
After each worker's configuration, the rules are listed, that forward to this
worker.
-The list contains three columns:
+The list contains four columns:
<ul>
<li>
-the type of the rule: Exact or Wildchar, eventually prefixed with Disabled or
Unmount (for exclusion rules)
+the name of the virtual server
</li>
<li>
-the URI pattern
+the URI pattern, prefixed with '-' for a disabled pattern and '!' for an
exclusion pattern
+</li>
+<li>
+the type of the rule: Exact or Wildchar
</li>
<li>
and the source of the rule definition: 'worker definition' for the
workers.properties file (mount attribute),
'JkMount' for Apache httpd JkMount and it's relatives and finally
'uriworkermap' for the uriworkermap file.
</li>
</ul>
+</p>
+<p>
+<b>Note: </b>The following restriction has been removed starting with version
1.2.26.
+<br/>
For Apache httpd, there is an important subtlety: the request going to the
status worker
gets executed in the context of some server (main or virtual). The status
worker will only show the
mapping rules, that are defined for this server (main or virtual).
+<br/>
+Until version 1.2.25 the list contained three columns:
+<ul>
+<li>
+the type of the rule: Exact or Wildchar, eventually prefixed with Disabled or
Unmount (for exclusion rules)
+</li>
+<li>
+the URI pattern
+</li>
+<li>
+and the source of the rule definition: 'worker definition' for the
workers.properties file (mount attribute),
+'JkMount' for Apache httpd JkMount and it's relatives and finally
'uriworkermap' for the uriworkermap file.
+</li>
+</ul>
</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
