Author: csutherl
Date: Thu Dec 13 22:03:14 2018
New Revision: 1848904
URL: http://svn.apache.org/viewvc?rev=1848904&view=rev
Log:
Use Tomcat stylesheet on the connector website to unify the web UIs of the two
projects
Added:
tomcat/jk/trunk/xdocs/images/asf-logo.svg (with props)
tomcat/jk/trunk/xdocs/images/cors-flowchart.png (with props)
tomcat/jk/trunk/xdocs/images/docs-stylesheet.css
tomcat/jk/trunk/xdocs/images/fonts/
tomcat/jk/trunk/xdocs/images/fonts/OpenSans400.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans400italic.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans600.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans600italic.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans700.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/OpenSans700italic.woff (with props)
tomcat/jk/trunk/xdocs/images/fonts/fonts.css
tomcat/jk/trunk/xdocs/images/tomcat.png (with props)
tomcat/jk/trunk/xdocs/tomcat-docs.xsl
Removed:
tomcat/jk/trunk/xdocs/style.css
tomcat/jk/trunk/xdocs/style.xsl
Modified:
tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml
tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml
tomcat/jk/trunk/xdocs/build.xml
tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
tomcat/jk/trunk/xdocs/common_howto/proxy.xml
tomcat/jk/trunk/xdocs/common_howto/quick.xml
tomcat/jk/trunk/xdocs/common_howto/timeouts.xml
tomcat/jk/trunk/xdocs/common_howto/workers.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml
tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml
tomcat/jk/trunk/xdocs/reference/apache.xml
tomcat/jk/trunk/xdocs/reference/iis.xml
tomcat/jk/trunk/xdocs/reference/status.xml
tomcat/jk/trunk/xdocs/reference/uriworkermap.xml
tomcat/jk/trunk/xdocs/reference/workers.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
tomcat/jk/trunk/xdocs/webserver_howto/nes.xml
Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/ajpv13a.xml Thu Dec 13 22:03:14 2018
@@ -348,8 +348,7 @@ Each of the above messages has a differe
<p>
For messages from the server to the container of type "Forward Request":
</p><p>
-<source>
-AJP13_FORWARD_REQUEST :=
+<source>AJP13_FORWARD_REQUEST :=
prefix_code (byte) 0x02 = JK_AJP13_FORWARD_REQUEST
method (byte)
protocol (string)
@@ -367,8 +366,7 @@ AJP13_FORWARD_REQUEST :=
</p><p>
The <code>request_headers</code> have the following structure:
</p><p>
-<source>
-req_header_name :=
+<source>req_header_name :=
sc_req_header_name | (string) [see below for how this is parsed]
sc_req_header_name := 0xA0xx (integer)
@@ -379,11 +377,9 @@ req_header_value := (string)
The <code>attributes</code> are optional and have the following structure:
</p><p>
-<source>
-attribute_name := sc_a_name | (sc_a_req_attribute string)
+<source>attribute_name := sc_a_name | (sc_a_req_attribute string)
attribute_value := (string)
-
</source>
</p><p>
Not that the all-important header is "content-length', because it
@@ -573,8 +569,7 @@ additional methods, even if they are not
<p>
For messages which the container can send back to the server.
-<source>
-AJP13_SEND_BODY_CHUNK :=
+<source>AJP13_SEND_BODY_CHUNK :=
prefix_code 3
chunk_length (integer)
chunk *(byte)
Modified: tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/ajpv13ext.xml Thu Dec 13 22:03:14 2018
@@ -183,8 +183,7 @@ crypto used, and misc datas (timeout...)
<subsection name="Messages Stream">
<p>
-<source>
-+----------------+------------------+-----------------+
+<source>+----------------+------------------+-----------------+
| LOGIN INIT CMD | NEGOCIATION DATA | WEB SERVER INFO |
+----------------+------------------+-----------------+
@@ -222,8 +221,7 @@ WEB SERVER INFO, SERVLET ENGINE INFO are
The secret key will be set by a new property in
workers.properties: secretkey
-<source>
-worker.ajp13.port=8009
+<source>worker.ajp13.port=8009
worker.ajp13.host=localhost
worker.ajp13.type=ajp13
worker.ajp13.secretkey=myverysecretkey
@@ -235,8 +233,7 @@ worker.ajp13.secretkey=myverysecretkey
<p>
AJP13 miss a functionality of AJP12, which is shutdown command.
A logout will tell servlet engine to shutdown itself.
-<source>
-+--------------+----------------------------+
+<source>+--------------+----------------------------+
| SHUTDOWN CMD | MD5 of RANDOM + SECRET KEY |
+--------------+----------------------------+
@@ -286,8 +283,7 @@ attributes list:
In the AJP13, we've got:
-<source>
-AJP13_FORWARD_REQUEST :=
+<source>AJP13_FORWARD_REQUEST :=
prefix_code 2
method (byte)
protocol (string)
@@ -317,16 +313,14 @@ AJP13_FORWARD_REQUEST :=
Using short 'web server attribute name' will reduce the
network traffic.
-<source>
-+-------------------+---------------------------+-------------------------------+----+
+<source>+-------------------+---------------------------+-------------------------------+----+
| EXTENDED VARS CMD | WEB SERVER ATTRIBUTE NAME | SERVLET ENGINE ATTRIBUTE
NAME | ES |
+-------------------+---------------------------+-------------------------------+----+
</source>
ie:
-<source>
-JkExtVars S1 SSL_CLIENT_V_START javax.servlet.request.ssl_start_cert_date
+<source>JkExtVars S1 SSL_CLIENT_V_START
javax.servlet.request.ssl_start_cert_date
JkExtVars S2 SSL_CLIENT_V_END javax.servlet.request.ssl_end_cert_date
JkExtVars S3 SSL_SESSION_ID javax.servlet.request.ssl_session_id
@@ -395,8 +389,7 @@ these particular virtual server (defined
This feature will help ISP and big sites which mutualize large farm
of Tomcat in load balancing configuration.
-<source>
-+-----------------+-------------------+----------+----------+----+
+<source>+-----------------+-------------------+----------+----------+----+
| CONTEXT QRY CMD | VIRTUAL HOST NAME | CONTEXTA | CONTEXTB | ES |
+-----------------+-------------------+----------+----------+----+
@@ -438,8 +431,7 @@ This directive will set the AJP13_CONTEX
ie: JkUpdateMount myworker1
-<source>
-+--------------------+-------------------+----------+--------+----------+--------+----+
+<source>+--------------------+-------------------+----------+--------+----------+--------+----+
| CONTEXT UPDATE CMD | VIRTUAL HOST NAME | CONTEXTA | STATUS | CONTEXTB |
STATUS | ES |
+--------------------+-------------------+----------+--------+----------+--------+----+
</source>
@@ -467,8 +459,7 @@ STATUS is one byte indicating if context
This query will be used by the web-server to determine if a given
contexts are UP, DOWN or INVALID (and should be removed).
-<source>
-+-------------------+--------------------+----------+----------+----+
+<source>+-------------------+--------------------+----------+----------+----+
| CONTEXT STATE CMD | VIRTUAL HOST NAME | CONTEXTA | CONTEXTB | ES |
+-------------------+--------------------+----------+----------+----+
@@ -501,8 +492,7 @@ where one end (web server or servlet eng
couldn't understand. In that case the receiver will send an
'UNKNOW PACKET CMD' with attached the unhandled message.
-<source>
-+--------------------+------------------------+-------------------+
+<source>+--------------------+------------------------+-------------------+
| UNKNOWN PACKET CMD | UNHANDLED MESSAGE SIZE | UNHANDLED MESSAGE |
+--------------------+------------------------+-------------------+
</source>
@@ -546,8 +536,7 @@ for upload operations with more than 8ko
The hack in the AJP13 protocol is to add some bytes to read after the end of
the
service:
-<source>
-EXAMPLE OF DISCUSSION BETWEEN WEB SERVER AND SERVLET ENGINE
+<source>EXAMPLE OF DISCUSSION BETWEEN WEB SERVER AND SERVLET ENGINE
AJP HTTP-HEADER (+ HTTP-POST) (WEB->SERVLET)
@@ -572,8 +561,7 @@ it will search for another servlet engin
And that feature will help ISP and big sites with farm of tomcat,
to updates their servlet engine without any service interruption.
-<source>
-+------------+-------------+
+<source>+------------+-------------+
| STATUS CMD | STATUS DATA |
+------------+-------------+
</source>
Modified: tomcat/jk/trunk/xdocs/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/build.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/build.xml (original)
+++ tomcat/jk/trunk/xdocs/build.xml Thu Dec 13 22:03:14 2018
@@ -49,7 +49,7 @@
<include name="BUILDING.txt"/>
<include name="README.txt"/>
<include name="RUNNING.txt"/>
- <include name="style.css"/>
+ <include name="images/docs-stylesheet.css"/>
</fileset>
</copy>
<copy todir="${build.dir}/${dist.name}">
@@ -74,7 +74,7 @@
<xslt basedir="."
destdir="${build.dir}/${dist.name}/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="build.xml project.xml empty.xml"
includes="*.xml">
<param name="relative-path" expression="./.."/>
@@ -85,7 +85,7 @@
<xslt basedir="reference"
destdir="${build.dir}/${dist.name}/reference"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -94,7 +94,7 @@
<xslt basedir="reference"
destdir="${build.dir}/${dist.name}/reference/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -105,7 +105,7 @@
<xslt basedir="common_howto"
destdir="${build.dir}/${dist.name}/common_howto"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -114,7 +114,7 @@
<xslt basedir="common_howto"
destdir="${build.dir}/${dist.name}/common_howto/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -125,7 +125,7 @@
<xslt basedir="webserver_howto"
destdir="${build.dir}/${dist.name}/webserver_howto"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -134,7 +134,7 @@
<xslt basedir="webserver_howto"
destdir="${build.dir}/${dist.name}/webserver_howto/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -145,7 +145,7 @@
<xslt basedir="ajp"
destdir="${build.dir}/${dist.name}/ajp"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -154,7 +154,7 @@
<xslt basedir="ajp"
destdir="${build.dir}/${dist.name}/ajp/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -165,7 +165,7 @@
<xslt basedir="miscellaneous"
destdir="${build.dir}/${dist.name}/miscellaneous"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -174,7 +174,7 @@
<xslt basedir="miscellaneous"
destdir="${build.dir}/${dist.name}/miscellaneous/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -185,7 +185,7 @@
<xslt basedir="news"
destdir="${build.dir}/${dist.name}/news"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
@@ -194,7 +194,7 @@
<xslt basedir="news"
destdir="${build.dir}/${dist.name}/news/printer"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression="../.."/>
@@ -211,7 +211,7 @@
<xslt basedir="."
destdir="${build.dir}/${dist.name}"
extension=".html"
- style="style.xsl"
+ style="tomcat-docs.xsl"
excludes="build.xml project.xml empty.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
Modified: tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/loadbalancers.xml Thu Dec 13 22:03:14
2018
@@ -28,7 +28,6 @@
</properties>
<body>
<section name="Introduction">
-<br/>
<p>A load balancer is a worker that does not directly communicate with Tomcat.
Instead it is responsible for the management of several "real" workers,
called members or sub workers of the load balancer.</p>
@@ -93,17 +92,16 @@ load will be distributed proportional to
more requests.</li>
</ul>
-<source>
- # The load balancer worker balance1 will distribute
- # load to the members worker1 and worker2
- worker.balance1.type=lb
- worker.balance1.balance_workers=worker1, worker2
- worker.worker1.type=ajp13
- worker.worker1.host=myhost1
- worker.worker1.port=8009
- worker.worker2.type=ajp13
- worker.worker1.host=myhost2
- worker.worker1.port=8009
+<source># The load balancer worker balance1 will distribute
+# load to the members worker1 and worker2
+worker.balance1.type=lb
+worker.balance1.balance_workers=worker1, worker2
+worker.worker1.type=ajp13
+worker.worker1.host=myhost1
+worker.worker1.port=8009
+worker.worker2.type=ajp13
+worker.worker1.host=myhost2
+worker.worker1.port=8009
</source>
<warn>
@@ -153,25 +151,24 @@ maintenance will reduce logging of false
<code>activation</code> set to <b>disabled</b> in combination with
the attribute <code>redirect</code> added to the other workers:</p>
-<source>
- # The advanced router LB worker
- worker.list=router
- worker.router.type=lb
- worker.router.balance_workers=worker1,worker2
-
- # Define the first member worker
- worker.worker1.type=ajp13
- worker.worker1.host=myhost1
- worker.worker1.port=8009
- # Define preferred failover node for worker1
- worker.worker1.redirect=worker2
-
- # Define the second member worker
- worker.worker2.type=ajp13
- worker.worker2.host=myhost2
- worker.worker2.port=8009
- # Disable worker2 for all requests except failover
- worker.worker2.activation=disabled
+<source># The advanced router LB worker
+worker.list=router
+worker.router.type=lb
+worker.router.balance_workers=worker1,worker2
+
+# Define the first member worker
+worker.worker1.type=ajp13
+worker.worker1.host=myhost1
+worker.worker1.port=8009
+# Define preferred failover node for worker1
+worker.worker1.redirect=worker2
+
+# Define the second member worker
+worker.worker2.type=ajp13
+worker.worker2.host=myhost2
+worker.worker2.port=8009
+# Disable worker2 for all requests except failover
+worker.worker2.activation=disabled
</source>
<p>
@@ -205,25 +202,22 @@ The status worker does not communicate w
Instead it is responsible for the worker management. It is
especially useful when combined with load balancer workers.
</p>
-<source>
- # Add the status worker to the worker list
- worker.list=jkstatus
- # Define a 'jkstatus' worker using status
- worker.jkstatus.type=status
+<source># Add the status worker to the worker list
+worker.list=jkstatus
+# Define a 'jkstatus' worker using status
+worker.jkstatus.type=status
</source>
<p>Next thing is to mount the requests to the jkstatus worker. For Apache
HTTP Servers use:</p>
-<source>
- # Add the jkstatus mount point
- JkMount /jkmanager/* jkstatus
+<source># Add the jkstatus mount point
+JkMount /jkmanager/* jkstatus
</source>
<p>To obtain a higher level of security use the:</p>
-<source>
- # Enable the JK manager access from localhost only
- <Location /jkmanager/>
- JkMount jkstatus
- Require ip 127.0.0.1
- </Location>
+<source># Enable the JK manager access from localhost only
+<Location /jkmanager/>
+ JkMount jkstatus
+ Require ip 127.0.0.1
+</Location>
</source>
</subsection>
Modified: tomcat/jk/trunk/xdocs/common_howto/proxy.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/proxy.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/proxy.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/proxy.xml Thu Dec 13 22:03:14 2018
@@ -28,7 +28,6 @@
</properties>
<body>
<section name="Introduction">
-<br/>
<p>The Apache HTTP Server module mod_jk and its ISAPI and NSAPI redirector
variants for Microsoft IIS and the iPlanet Web Server connect
the web server to a backend (typically Tomcat) using the AJP protocol.
@@ -38,7 +37,6 @@ or a proxy, in the context of HTTP it is
</p>
</section>
<section name="Typical Problems">
-<br/>
<p>A reverse proxy is not totally transparent to the application on
the backend. For instance the host name and port the original client
(e.g. browser) needs to talk to belong to the web server and not to the
@@ -54,7 +52,6 @@ the client IP is used by the backend app
</p>
</section>
<section name="AJP as a Solution">
-<br/>
<p>Most of these problems are automatically handled by the AJP protocol
and the AJP connectors of the backend. The AJP protocol transports
this communication metadata and the backend connector presents this
@@ -134,7 +131,6 @@ This is for Tomcat, it has not yet been
</p>
</section>
<section name="Fine Tuning">
-<br/>
<p>In some situations this is not enough though. Assume there is another
less clever reverse proxy in front of your web server, for instance an
HTTP load balancer or similar device which also serves as an SSL accelerator.
@@ -212,7 +208,6 @@ in the <code>X-Forwarded-For</code> head
</p>
</section>
<section name="Tomcat AJP Connector Settings">
-<br/>
<p>As an alternative to using the environment variables described in the
previous section
(which do only exist when using Apache), you can also configure Tomcat to
overwrite
some of the communications data forwarded by mod_jk. The AJP connector in
Tomcat's <code>server.xml</code>
@@ -232,7 +227,6 @@ where the web server running mod_jk know
</p>
</section>
<section name="URL Handling">
-<br/>
<subsection name="URL Rewriting">
<p>Sometimes one want to change path components of the URLs under which an
application
is available. Especially if a web application is deployed as some context, say
<code>/myapp</code>,
@@ -251,8 +245,7 @@ users proceed using the more complex URL
That's the easy case, and if this suffices to you, you're lucky. Use a simply
RedirectMatch
for the Apache HTTP Server:
</p>
-<source>
-RedirectMatch ^/$ http://www.mycompany.com/myapp/
+<source>RedirectMatch ^/$ http://www.mycompany.com/myapp/
</source>
<p>Your application will then be available under
<code>http://www.mycompany.com/</code>,
and each visitor will be immediately redirected to the real URL
@@ -266,8 +259,7 @@ First the solution for the case of the A
<p>1. Use <a
href="http://httpd.apache.org/docs/current/mod/mod_rewrite.html";><code>mod_rewrite</code></a>
to add <code>/myapp</code> to all requests before forwarding to the backend:
</p>
-<source>
-# Don't forget the PT flag! (pass through)
+<source># Don't forget the PT flag! (pass through)
RewriteRule ^/(.*) http://www.mycompany.com/myapp/$1 [PT]
</source>
<p>2. Use <a
href="http://httpd.apache.org/docs/current/mod/mod_headers.html";><code>mod_headers</code></a>
@@ -277,8 +269,7 @@ the full URL, and your application is no
some shortened URL. An HTTP redirect is done with a special response header
named <code>Location</code>.
We rewrite the Location headers of our responses:
</p>
-<source>
-# Keep protocol, server and port if present,
+<source># Keep protocol, server and port if present,
# but insert our webapp name before the rest of the URL
Header edit Location ^([^/]*//[^/]*)?/(.*)$ $1/myapp/$2
</source>
@@ -288,8 +279,7 @@ the path components you want to hide.
A cookie is set with the HTTP response header named <code>Set-Cookie</code>.
We rewrite the Set-Cookie headers of our responses:
</p>
-<source>
-# Fix the cookie path
+<source># Fix the cookie path
Header edit Set-Cookie "^(.*; Path=/)(.*)" $1/myapp/$2
</source>
<p>3. Some applications might contain hard coded absolute links.
@@ -306,8 +296,7 @@ for this task.
of doing the first step with a builtin feature. You define a mapping file for
simple prefix
changes like this:
</p>
-<source>
-# Add a context prefix to all requests ...
+<source># Add a context prefix to all requests ...
/=/myapp/
# ... or change some prefix ...
/oldapp/=/myapp/
@@ -319,8 +308,7 @@ still need to map the URLs as they are b
<p>More complex rewrites can be done using the same file, but with regular
expressions. A leading
tilde sign '<code>~</code>', indicates, that you are using a regular
expression:
</p>
-<source>
-# Use a regular expression rewrite
+<source># Use a regular expression rewrite
~/oldapps([0-9]*)/=/newapps$1/
</source>
<p>There is no support for Steps 2 (rewriting redirect responses) or 3
(rewriting cookie paths).
@@ -351,7 +339,6 @@ and remove all old explicit settings.
</subsection>
</section>
<section name="Request Attributes">
-<br/>
<p>
You can also add more attributes to any request you are forwarding when using
the Apache HTTP Server.
For this use the <code>JkEnvVar</code> directive (for details see the
Modified: tomcat/jk/trunk/xdocs/common_howto/quick.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/quick.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/quick.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/quick.xml Thu Dec 13 22:03:14 2018
@@ -54,15 +54,12 @@
to the Tomcat engine, complete documentation is available in <a
href="workers.html">Workers HowTo</a>.
</p>
<p>
-<source>
-
- # Define 1 real worker using ajp13
- worker.list=worker1
- # Set properties for worker1 (ajp13)
- worker.worker1.type=ajp13
- worker.worker1.host=localhost
- worker.worker1.port=8009
-
+<source># Define 1 real worker using ajp13
+worker.list=worker1
+# Set properties for worker1 (ajp13)
+worker.worker1.type=ajp13
+worker.worker1.host=localhost
+worker.worker1.port=8009
</source>
</p>
</section>
@@ -116,29 +113,26 @@
</ul>
</p>
<p>
-<source>
-
- # Load mod_jk module
- # Update this path to match your modules location
- LoadModule jk_module modules/mod_jk.so
- # Declare the module for <IfModule directive> (remove this line for
Apache 2.x)
- AddModule mod_jk.c
- # Where to find workers.properties
- # Update this path to match your conf directory location (put
workers.properties next to httpd.conf)
- JkWorkersFile /etc/httpd/conf/workers.properties
- # Where to put jk shared memory
- # Update this path to match your local state directory or logs directory
- JkShmFile /var/log/httpd/mod_jk.shm
- # Where to put jk logs
- # Update this path to match your logs directory location (put mod_jk.log
next to access_log)
- JkLogFile /var/log/httpd/mod_jk.log
- # Set the jk log level [debug/error/info]
- JkLogLevel info
- # Select the timestamp log format
- JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
- # Send everything for context /examples to worker named worker1 (ajp13)
- JkMount /examples/* worker1
-
+<source># Load mod_jk module
+# Update this path to match your modules location
+LoadModule jk_module modules/mod_jk.so
+# Declare the module for <IfModule directive> (remove this line for
Apache 2.x)
+AddModule mod_jk.c
+# Where to find workers.properties
+# Update this path to match your conf directory location (put
workers.properties next to httpd.conf)
+JkWorkersFile /etc/httpd/conf/workers.properties
+# Where to put jk shared memory
+# Update this path to match your local state directory or logs directory
+JkShmFile /var/log/httpd/mod_jk.shm
+# Where to put jk logs
+# Update this path to match your logs directory location (put mod_jk.log next
to access_log)
+JkLogFile /var/log/httpd/mod_jk.log
+# Set the jk log level [debug/error/info]
+JkLogLevel info
+# Select the timestamp log format
+JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
+# Send everything for context /examples to worker named worker1 (ajp13)
+JkMount /examples/* worker1
</source>
</p>
</section>
Modified: tomcat/jk/trunk/xdocs/common_howto/timeouts.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/timeouts.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/timeouts.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/timeouts.xml Thu Dec 13 22:03:14 2018
@@ -28,7 +28,6 @@
</properties>
<body>
<section name="Introduction">
-<br/>
<p>Setting communication timeouts is very important to improve the
communication process. They help to detect problems and stabilise
a distributed system. JK can use several different timeout types, which
@@ -42,18 +41,16 @@ items, please consult the worker <a href
This page assumes, that you are using at least version 1.2.16 of JK.
Dependencies on newer versions will be mentioned where necessary.
</p>
-<warn>
+<span style="color: red;">
Do not set timeouts to extreme values. Very small timeouts will likely
be counterproductive.
-</warn>
-<warn>
+<br/><br/>
Long Garbage Collection pauses on the backend do not make a good
fit with some timeouts. Try to optimise your Java memory and GC settings.
-</warn>
+</span>
</section>
<section name="JK Timeout Attributes">
-<br/>
<subsection name="CPing/CPong">
<p>
CPing/CPong is our notion for using small test packets to check the
@@ -301,13 +298,13 @@ reply timeout. Applications that do not
are batch type applications, data warehouse and reporting applications
which are expected to observe long processing times.
</p>
-<warn>
+<span style="color: red;">
If JK aborts waiting for a response, because a reply timeout fired,
there is no way to stop processing on the backend. Although you free
processing resources in your web server, the request
will continue to run on the backend - without any way to send back a
result once the reply timeout fired.
-</warn>
+</span>
<p>
JK uses the worker attribute <b>reply_timeout</b> to set reply timeouts.
The default value is "0" (timeout disabled) and you can set it to any
@@ -338,7 +335,6 @@ load balancer.
</section>
<section name="Load Balancer Error Detection">
-<br/>
<subsection name="Local and Global Error States">
<p>
A load balancer worker does not only have the ability to balance load.
Modified: tomcat/jk/trunk/xdocs/common_howto/workers.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/common_howto/workers.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/common_howto/workers.xml (original)
+++ tomcat/jk/trunk/xdocs/common_howto/workers.xml Thu Dec 13 22:03:14 2018
@@ -82,9 +82,8 @@ the file contains entries of the followi
<b>worker.list</b>=<a comma separated list of worker names>
</p>
-<source>
- # the list of workers
- worker.list= worker1, worker2
+<source># the list of workers
+worker.list= worker1, worker2
</source>
<p>
@@ -118,13 +117,12 @@ Where worker name is the name assigned t
in the table (a worker name may only contain any space the characters
[a-zA-Z0-9\-_]).
</p>
-<source>
- # Defines a worker named "local" that uses the ajp12 protocol to forward
requests to a Tomcat process.
- worker.local.type=ajp12
- # Defines a worker named "remote" that uses the ajp13 protocol to forward
requests to a Tomcat process.
- worker.remote.type=ajp13
- # Defines a worker named "loadbalancer" that loadbalances several Tomcat
processes transparently.
- worker.loadbalancer.type=lb
+<source># Defines a worker named "local" that uses the ajp12 protocol to
forward requests to a Tomcat process.
+worker.local.type=ajp12
+# Defines a worker named "remote" that uses the ajp13 protocol to forward
requests to a Tomcat process.
+worker.remote.type=ajp13
+# Defines a worker named "loadbalancer" that loadbalances several Tomcat
processes transparently.
+worker.loadbalancer.type=lb
</source>
</subsection>
@@ -170,12 +168,11 @@ The ajp12 worker properties are:
We'll see more on this in the <a
href="../common_howto/loadbalancers.html">load balancer worker</a> section.
</p>
-<source>
- # worker "worker1" will talk to Tomcat listening on machine www.x.com at
port 8007 using 2 lb factor
- worker.worker1.type=ajp12
- worker.worker1.host=www.x.com
- worker.worker1.port=8007
- worker.worker1.lbfactor=2
+<source># worker "worker1" will talk to Tomcat listening on machine www.x.com
at port 8007 using 2 lb factor
+worker.worker1.type=ajp12
+worker.worker1.host=www.x.com
+worker.worker1.port=8007
+worker.worker1.lbfactor=2
</source>
<p>
@@ -210,18 +207,17 @@ You should note that ajp13 is the recomm
</p>
-<source>
- # worker "worker2" will talk to Tomcat listening on machine www2.x.com at
port 8009 using 3 lb factor
- worker.worker2.type=ajp13
- worker.worker2.host=www2.x.com
- worker.worker2.port=8009
- worker.worker2.lbfactor=3
- # worker "worker2" uses connections, which will stay no more than 10mn in
the connection pool
- worker.worker2.connection_pool_timeout=600
- # worker "worker2" ask operating system to send KEEP-ALIVE signal on the
connection
- worker.worker2.socket_keepalive=1
- # mount can be used as an alternative to the JkMount directive
- worker.worker2.mount=/contexta /contexta/* /contextb /contextb/*
+<source># worker "worker2" will talk to Tomcat listening on machine www2.x.com
at port 8009 using 3 lb factor
+worker.worker2.type=ajp13
+worker.worker2.host=www2.x.com
+worker.worker2.port=8009
+worker.worker2.lbfactor=3
+# worker "worker2" uses connections, which will stay no more than 10mn in the
connection pool
+worker.worker2.connection_pool_timeout=600
+# worker "worker2" ask operating system to send KEEP-ALIVE signal on the
connection
+worker.worker2.socket_keepalive=1
+# mount can be used as an alternative to the JkMount directive
+worker.worker2.mount=/contexta /contexta/* /contextb /contextb/*
</source>
<p>
@@ -272,9 +268,8 @@ can persist session data across multiple
</ul>
</p>
-<source>
- # The worker balance1 while use "real" workers worker1 and worker2
- worker.balance1.balance_workers=worker1, worker2
+<source># The worker balance1 while use "real" workers worker1 and worker2
+worker.balance1.balance_workers=worker1, worker2
</source>
</subsection>
@@ -284,25 +279,22 @@ can persist session data across multiple
The status worker does not communicate with Tomcat.
Instead it is responsible for the load balancer management.
</p>
-<source>
- # Add the status worker to the worker list
- worker.list=jkstatus
- # Define a 'jkstatus' worker using status
- worker.jkstatus.type=status
+<source># Add the status worker to the worker list
+worker.list=jkstatus
+# Define a 'jkstatus' worker using status
+worker.jkstatus.type=status
</source>
<p>Next thing is to mount the requests to the jkstatus worker. For Apache
HTTP Servers use:</p>
-<source>
- # Add the jkstatus mount point
- JkMount /jkmanager/* jkstatus
+<source># Add the jkstatus mount point
+JkMount /jkmanager/* jkstatus
</source>
<p>To obtain a higher level of security use the:</p>
-<source>
- # Enable the JK manager access from localhost only
- <Location /jkmanager/>
- JkMount jkstatus
- Require ip 127.0.0.1
- </Location>
+<source># Enable the JK manager access from localhost only
+<Location /jkmanager/>
+ JkMount jkstatus
+ Require ip 127.0.0.1
+</Location>
</source>
</subsection>
@@ -314,14 +306,13 @@ These macros let you define properties a
constructing other properties.
</p>
-<source>
- # property example, like a network base address
- mynet=194.226.31
- # Using the above macro to simplify the address definitions
- # for a farm of workers.
- worker.node1.host=$(mynet).11
- worker.node2.host=$(mynet).12
- worker.node3.host=$(mynet).13
+<source># property example, like a network base address
+mynet=194.226.31
+# Using the above macro to simplify the address definitions
+# for a farm of workers.
+worker.node1.host=$(mynet).11
+worker.node2.host=$(mynet).12
+worker.node3.host=$(mynet).13
</source>
</subsection>
@@ -334,15 +325,14 @@ configuration parameters from "y", excep
that have explicitly been set for "x".
</p>
-<source>
- # worker toe defines some default settings
- worker.toe.type=ajp13
- worker.toe.socket_keepalive=true
- worker.toe.connect_timeout=10000
- worker.toe.recovery_options=7
- # workers tic and tac inherit those values
- worker.tic.reference=worker.toe
- worker.tac.reference=worker.toe
+<source># worker toe defines some default settings
+worker.toe.type=ajp13
+worker.toe.socket_keepalive=true
+worker.toe.connect_timeout=10000
+worker.toe.recovery_options=7
+# workers tic and tac inherit those values
+worker.tic.reference=worker.toe
+worker.tac.reference=worker.toe
</source>
<p>
@@ -368,34 +358,33 @@ References are especially useful, when c
Try to understand the following two stage references:
</p>
-<source>
- # We only use one load balancer
- worker.list=lb
- # Let's define some defaults
- worker.basic.port=8009
- worker.basic.type=ajp13
- worker.basic.socket_keepalive=true
- worker.basic.connect_timeout=10000
- worker.basic.recovery_options=7
- # And we use them in two groups
- worker.lb1.domain=dom1
- worker.lb1.distance=0
- worker.lb1.reference=worker.basic
- worker.lb2.domain=dom2
- worker.lb2.distance=1
- worker.lb2.reference=worker.basic
- # Now we configure the load balancer
- worker.lb.type=lb
- worker.lb.method=B
- worker.lb.balanced_workers=w11,w12,w21,w22
- worker.w11.host=myhost11
- worker.w11.reference=worker.lb1
- worker.w12.host=myhost12
- worker.w12.reference=worker.lb1
- worker.w21.host=myhost21
- worker.w21.reference=worker.lb2
- worker.w22.host=myhost22
- worker.w22.reference=worker.lb2
+<source># We only use one load balancer
+worker.list=lb
+# Let's define some defaults
+worker.basic.port=8009
+worker.basic.type=ajp13
+worker.basic.socket_keepalive=true
+worker.basic.connect_timeout=10000
+worker.basic.recovery_options=7
+# And we use them in two groups
+worker.lb1.domain=dom1
+worker.lb1.distance=0
+worker.lb1.reference=worker.basic
+worker.lb2.domain=dom2
+worker.lb2.distance=1
+worker.lb2.reference=worker.basic
+# Now we configure the load balancer
+worker.lb.type=lb
+worker.lb.method=B
+worker.lb.balanced_workers=w11,w12,w21,w22
+worker.w11.host=myhost11
+worker.w11.reference=worker.lb1
+worker.w12.host=myhost12
+worker.w12.reference=worker.lb1
+worker.w21.host=myhost21
+worker.w21.reference=worker.lb2
+worker.w22.host=myhost22
+worker.w22.reference=worker.lb2
</source>
</subsection>
@@ -421,24 +410,23 @@ An lb worker that load balances over the
</li>
</ul>
-<source>
- # Define 3 workers, 2 real workers using ajp13, and one being a load
balancing worker
- worker.list=node1, node2, lbworker
- # Set properties for node1 (ajp13)
- worker.node1.type=ajp13
- worker.node1.host=localhost
- worker.node1.port=8109
- worker.node1.connection_pool_timeout=600
- worker.node1.socket_keepalive=1
- # Set properties for node2 (ajp13)
- worker.node2.type=ajp13
- worker.node2.host=localhost
- worker.node2.port=8209
- worker.node2.connection_pool_timeout=600
- worker.node2.socket_keepalive=1
- # Set properties for lbworker which uses node1 and node2
- worker.lbworker.type=lb
- worker.lbworker.balance_workers=node1,node2
+<source># Define 3 workers, 2 real workers using ajp13, and one being a load
balancing worker
+worker.list=node1, node2, lbworker
+# Set properties for node1 (ajp13)
+worker.node1.type=ajp13
+worker.node1.host=localhost
+worker.node1.port=8109
+worker.node1.connection_pool_timeout=600
+worker.node1.socket_keepalive=1
+# Set properties for node2 (ajp13)
+worker.node2.type=ajp13
+worker.node2.host=localhost
+worker.node2.port=8209
+worker.node2.connection_pool_timeout=600
+worker.node2.socket_keepalive=1
+# Set properties for lbworker which uses node1 and node2
+worker.lbworker.type=lb
+worker.lbworker.balance_workers=node1,node2
</source>
</section>
Added: tomcat/jk/trunk/xdocs/images/asf-logo.svg
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/asf-logo.svg?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/asf-logo.svg
------------------------------------------------------------------------------
svn:mime-type = image/svg+xml
Added: tomcat/jk/trunk/xdocs/images/cors-flowchart.png
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/cors-flowchart.png?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/cors-flowchart.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: tomcat/jk/trunk/xdocs/images/docs-stylesheet.css
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/docs-stylesheet.css?rev=1848904&view=auto
==============================================================================
--- tomcat/jk/trunk/xdocs/images/docs-stylesheet.css (added)
+++ tomcat/jk/trunk/xdocs/images/docs-stylesheet.css Thu Dec 13 22:03:14 2018
@@ -0,0 +1,303 @@
+@charset "utf-8";
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/* Fonts */
+@import url("fonts/fonts.css");
+
+/* General style */
+
+h1, h2, h3, h4, h5, h6, th {
+ font-weight: 600;
+}
+
+body {
+ margin: 0;
+}
+
+body, input {
+ font-family: 'Open Sans', sans-serif;
+ font-size: 10.5pt;
+}
+
+code, pre {
+ font-family: Consolas, monospace;
+}
+
+img {
+ border: 0;
+}
+
+table {
+ border-collapse: collapse;
+ text-align: left;
+}
+table *:not(table) {
+ /* Prevent border-collapsing for table child elements like <div> */
+ border-collapse: separate;
+}
+
+th {
+ text-align: left;
+}
+
+main {
+ /* Remove this once all IEs support <main> element */
+ display: block;
+}
+
+
+/* Layout */
+
+#wrapper {
+ min-width: 400px;
+}
+
+#header {
+ border-bottom: 1px solid #bbb;
+}
+
+@media not print {
+ #header {
+ box-shadow: 0 0 7px #aaa;
+ }
+}
+
+#header > div {
+ padding-left: 15px;
+ padding-right: 15px;
+
+ /* Work-around for old browsers: */
+ background-color: #F8F3E4;
+ background: linear-gradient(to bottom, #ffffff -10%, #F8F3E4 100%);
+ position: relative;
+}
+
+#header .logo {
+ float: left;
+ padding-top: 10px;
+ min-width: 190px;
+}
+
+#header .logo img{
+ /* To avoid that the Font Descender being added to the parent div's height */
+ vertical-align: middle;
+}
+
+#header .asfLogo {
+ float: right;
+ position: relative;
+ top: 8px;
+}
+
+#header h1 {
+ margin-top: 0.6em;
+ margin-bottom: 0;
+}
+
+#header .versionInfo {
+ font-size: 13pt;
+ margin-bottom: 1em;
+}
+
+#middle {
+ display: table;
+ table-layout: fixed;
+ margin: 0;
+ width: 100%;
+}
+#middle > div { display: table-row; }
+#middle > div > div { display: table-cell; vertical-align: top; }
+
+
+
+#mainLeft {
+ width: 190px;
+}
+
+#mainLeft > div {
+ margin-top: -1px; /* to overwrite border of element above */
+ padding-left: 16px;
+ padding-right: 14px;
+ padding-top: 6px;
+ padding-bottom: 15px;
+ background-color: #F8F3E4;
+ border-right: 1px solid #bbb;
+ border-bottom: 1px solid #bbb;
+ font-size: 10pt;
+ border-bottom-right-radius: 20px;
+ box-shadow: 0 0 5px #aaa;
+}
+
+#mainLeft h2 {
+ margin-bottom: 0.2em;
+ font-size: 1.2em;
+}
+
+#mainLeft ul {
+ padding: 0;
+ margin: 0;
+ list-style-type: none;
+}
+
+#mainLeft ul a {
+ text-indent: -0.6em;
+ padding-left: 1.4em;
+ display: block;
+ text-decoration: none;
+ color: #444;
+}
+#mainLeft ul a:hover {
+ color: #000;
+ background-color: #D1c9b9;
+}
+
+#mainRight {
+ padding-left: 14px;
+ padding-right: 20px;
+
+}
+
+#footer {
+ margin-top: 30px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+ padding-left: 20px;
+ padding-right: 20px;
+ border-top: 1px solid #ccc;
+ color: #444;
+ text-align: center;
+ /* font-style: italic; */
+ font-size: 9pt;
+}
+
+
+/* Content */
+
+#content div.text {
+ padding-left: 1em;
+ padding-left: 1em;
+}
+
+#content h3, #content h4, #content h5, #content h6 {
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #eaeaea;
+}
+
+@media not print {
+ #content h3, #content h4, #content h5, #content h6 {
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ }
+}
+
+#content h4, #content h5, #content h6 {
+ background-color: #f6f6f6;
+}
+
+code {
+ background-color: rgb(224,255,255);
+}
+
+div.codeBox pre code, code.attributeName, code.propertyName, code.noHighlight,
.noHighlight code {
+ background-color: transparent;
+}
+div.codeBox {
+ overflow: auto;
+ margin: 1em 0;
+}
+div.codeBox pre {
+ margin: 0;
+ padding: 4px;
+ border: 1px solid #999;
+ border-radius: 5px;
+ background-color: #eff8ff;
+ display: table; /* To prevent <pre>s from taking the complete available
width. */
+ /*
+ When it is officially supported, use the following CSS instead of display:
table
+ to prevent big <pre>s from exceeding the browser window:
+ max-width: available;
+ width: min-content;
+ */
+}
+
+div.codeBox pre.wrap {
+ white-space: pre-wrap;
+}
+
+
+table.defaultTable tr, table.detail-table tr {
+ border: 1px solid #CCC;
+}
+
+table.defaultTable tr:nth-child(even), table.detail-table tr:nth-child(even) {
+ background-color: #FAFBFF;
+}
+
+table.defaultTable tr:nth-child(odd), table.detail-table tr:nth-child(odd) {
+ background-color: #EEEFFF;
+}
+
+table.defaultTable th, table.detail-table th {
+ background-color: #88b;
+ color: #fff;
+}
+
+table.defaultTable th, table.defaultTable td, table.detail-table th,
table.detail-table td {
+ padding: 5px 8px;
+}
+
+
+p.notice {
+ border: 1px solid rgb(255, 0, 0);
+ background-color: rgb(238, 238, 238);
+ color: rgb(0, 51, 102);
+ padding: 0.5em;
+ margin: 1em 2em 1em 1em;
+}
+
+
+/* Changelog-Styles */
+
+ul.changelog {
+ padding-left: 1em;
+ list-style-type: none;
+}
+
+ul.changelog li{
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+ul.changelog img {
+ vertical-align: middle
+}
+
+
+/* Printer-only Styles */
+@media print {
+ .noPrint { display: none; }
+ #middle > div > div#mainLeft { display: none; }
+ a { color: inherit; text-decoration: none; }
+}
+
+/* Fix for Comments section which contains a <h4> */
+#comments_thread h1, #comments_thread h2, #comments_thread h3,
#comments_thread h4, #comments_thread h5, #comments_thread h6 {
+ border: none;
+ background-color: transparent;
+}
\ No newline at end of file
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans400.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans400.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans400.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans400italic.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans400italic.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans400italic.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans600.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans600.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans600.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans600italic.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans600italic.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans600italic.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans700.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans700.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans700.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/OpenSans700italic.woff
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/OpenSans700italic.woff?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/fonts/OpenSans700italic.woff
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/jk/trunk/xdocs/images/fonts/fonts.css
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/fonts/fonts.css?rev=1848904&view=auto
==============================================================================
--- tomcat/jk/trunk/xdocs/images/fonts/fonts.css (added)
+++ tomcat/jk/trunk/xdocs/images/fonts/fonts.css Thu Dec 13 22:03:14 2018
@@ -0,0 +1,54 @@
+@charset "utf-8";
+/*
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Open Sans'), local('OpenSans'), url('OpenSans400.woff')
format('woff');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 400;
+ src: local('Open Sans Italic'), local('OpenSans-Italic'),
url('OpenSans400italic.woff') format('woff');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 600;
+ src: local('Open Sans Semibold'), local('OpenSans-Semibold'),
url('OpenSans600.woff') format('woff');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 600;
+ src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'),
url('OpenSans600italic.woff') format('woff');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: normal;
+ font-weight: 700;
+ src: local('Open Sans Bold'), local('OpenSans-Bold'),
url('OpenSans700.woff') format('woff');
+}
+@font-face {
+ font-family: 'Open Sans';
+ font-style: italic;
+ font-weight: 700;
+ src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
url('OpenSans700italic.woff') format('woff');
+}
\ No newline at end of file
Added: tomcat/jk/trunk/xdocs/images/tomcat.png
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/images/tomcat.png?rev=1848904&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/jk/trunk/xdocs/images/tomcat.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: tomcat/jk/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Thu Dec 13 22:03:14 2018
@@ -82,7 +82,6 @@ manual is described in more detail below
</section>
<section name="Reference Guide">
-<br />
<ul>
<li><a href="reference/workers.html"><b>workers.properties</b></a>
<p>A Tomcat worker is a Tomcat instance that is waiting to execute servlets
@@ -123,7 +122,6 @@ Apache HTTP Server.
</section>
<section name="Common HowTo">
-<br />
<ul>
<li><a href="common_howto/quick.html"><b>Quick Start</b></a>
@@ -154,7 +152,6 @@ handles this situation and how you can i
</section>
<section name="Webserver HowTo">
-<br />
<p>These pages contain detailed descriptions of how to build and
install JK for the various web servers.
</p>
@@ -171,7 +168,6 @@ install JK for the various web servers.
</section>
<section name="AJP Protocol Reference">
-<br />
<ul>
<li><a href="ajp/ajpv13a.html"><b>AJPv13</b></a>
<p>This page describes the Apache JServ Protocol version 1.3 (hereafter
@@ -187,7 +183,6 @@ install JK for the various web servers.
</section>
<section name="Miscellaneous documentation">
-<br />
<ul>
<li><a href="miscellaneous/faq.html"><b>Frequently asked questions</b></a>
<p>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Thu Dec 13 22:03:14 2018
@@ -41,14 +41,12 @@
</p>
</section>
<section name="Changes between 1.2.46 and 1.2.47">
- <br />
<subsection name="Native">
<changelog>
</changelog>
</subsection>
</section>
<section name="Changes between 1.2.45 and 1.2.46">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -60,7 +58,6 @@
</subsection>
</section>
<section name="Changes between 1.2.44 and 1.2.45">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -95,7 +92,6 @@
</subsection>
</section>
<section name="Changes between 1.2.43 and 1.2.44">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -154,7 +150,6 @@
</subsection>
</section>
<section name="Changes between 1.2.42 and 1.2.43">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -185,7 +180,6 @@
</subsection>
</section>
<section name="Changes between 1.2.41 and 1.2.42">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -272,7 +266,6 @@
</subsection>
</section>
<section name="Changes between 1.2.40 and 1.2.41">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -461,7 +454,6 @@
</subsection>
</section>
<section name="Changes between 1.2.39 and 1.2.40">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -492,7 +484,6 @@
</subsection>
</section>
<section name="Changes between 1.2.37 and 1.2.39">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -544,7 +535,6 @@
</subsection>
</section>
<section name="Changes between 1.2.36 and 1.2.37">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -559,7 +549,6 @@
</subsection>
</section>
<section name="Changes between 1.2.35 and 1.2.36">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -584,7 +573,6 @@
</subsection>
</section>
<section name="Changes between 1.2.33 and 1.2.35">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -603,7 +591,6 @@
</subsection>
</section>
<section name="Changes between 1.2.32 and 1.2.33">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -708,7 +695,6 @@
</subsection>
</section>
<section name="Changes between 1.2.31 and 1.2.32">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -779,7 +765,6 @@
</subsection>
</section>
<section name="Changes between 1.2.30 and 1.2.31">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -834,7 +819,6 @@
</subsection>
</section>
<section name="Changes between 1.2.28 and 1.2.30">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -963,7 +947,6 @@
</subsection>
</section>
<section name="Changes between 1.2.27 and 1.2.28">
- <br />
<subsection name="Native">
<changelog>
<add>
@@ -1105,7 +1088,6 @@
</subsection>
</section>
<section name="Changes between 1.2.26 and 1.2.27">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -1402,7 +1384,6 @@
</subsection>
</section>
<section name="Changes between 1.2.25 and 1.2.26">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -1505,7 +1486,6 @@
</subsection>
</section>
<section name="Changes between 1.2.24 and 1.2.25">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -1561,7 +1541,6 @@
</subsection>
</section>
<section name="Changes between 1.2.23 and 1.2.24">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -1720,7 +1699,6 @@
</subsection>
</section>
<section name="Changes between 1.2.22 and 1.2.23">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -1736,7 +1714,6 @@
</subsection>
</section>
<section name="Changes between 1.2.21 and 1.2.22">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -1853,7 +1830,6 @@
</subsection>
</section>
<section name="Changes between 1.2.20 and 1.2.21">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -1963,7 +1939,6 @@
</subsection>
</section>
<section name="Changes between 1.2.19 and 1.2.20">
- <br />
<subsection name="Native">
<changelog>
<add>
@@ -2174,7 +2149,6 @@
</subsection>
</section>
<section name="Changes between 1.2.18 and 1.2.19">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2324,7 +2298,6 @@
</subsection>
</section>
<section name="Changes between 1.2.17 and 1.2.18">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2337,7 +2310,6 @@
</subsection>
</section>
<section name="Changes between 1.2.16 and JK 1.2.17">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2352,7 +2324,6 @@
</subsection>
</section>
<section name="Changes between 1.2.15 and JK 1.2.16">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2466,7 +2437,6 @@
</subsection>
</section>
<section name="Changes between 1.2.14 and 1.2.15">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2481,7 +2451,6 @@
</subsection>
</section>
<section name="Changes between 1.2.13 and 1.2.14">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2513,7 +2482,6 @@
</subsection>
</section>
<section name="Changes between 1.2.12 and 1.2.13">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2553,7 +2521,6 @@
</section>
<section name="Changes between 1.2.11 and 1.2.12">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2571,7 +2538,6 @@
</section>
<section name="Changes between 1.2.10 and 1.2.11">
- <br />
<subsection name="Native">
<changelog>
<fix>Backport SC_M_JK_STORED from JK2 for passing arbitrary
@@ -2633,7 +2599,6 @@
</subsection>
</section>
<section name="Changes between 1.2.8 and 1.2.10">
- <br />
<subsection name="Native">
<changelog>
<update>Set default shared memory to 64K instead 1M. (mturk)
@@ -2699,7 +2664,6 @@
</subsection>
</section>
<section name="Changes between 1.2.7 and 1.2.8">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2758,7 +2722,6 @@
</subsection>
</section>
<section name="Changes between 1.2.6 and 1.2.7">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2823,7 +2786,6 @@
</subsection>
</section>
<section name="Changes between 1.2.5 and 1.2.6">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2852,7 +2814,6 @@
</subsection>
</section>
<section name="Changes between 1.2.4 and 1.2.5">
- <br />
<subsection name="Native">
<changelog>
<fix>
@@ -2887,7 +2848,6 @@
</subsection>
</section>
<section name="Changes between 1.2.3 and 1.2.4">
- <br />
<subsection name="Native">
<changelog>
<add>
@@ -2907,7 +2867,6 @@
</subsection>
</section>
<section name="Changes between 1.2.2 and 1.2.3">
- <br />
<subsection name="Native">
<changelog>
<add>
@@ -2945,7 +2904,6 @@
</subsection>
</section>
<section name="Changes between 1.2.1 and 1.2.2">
- <br />
<subsection name="Native">
<changelog>
<update>
@@ -2966,7 +2924,6 @@
</subsection>
</section>
<section name="Changes between 1.2.0 and 1.2.1">
- <br />
<subsection name="Native">
<changelog>
<fix>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/doccontrib.xml Thu Dec 13 22:03:14 2018
@@ -96,24 +96,20 @@ your <b>SVN_HOME</b>. Mine is located i
<p>
Run the following command to <b>checkout</b> the sources for the first
time.
You should only need to do this once.
-<screen>
-<read> </read>
-<read>C:\build\>svn checkout http://svn.apache.org/repos/asf/tomcat/jk/trunk/
-tomcat-connectors</read>
-<read> </read>
-</screen>
+<source>C:\build\>svn checkout http://svn.apache.org/repos/asf/tomcat/jk/trunk/
+tomcat-connectors
+</source>
</p>
<p>
You should now be watching all the downloads come in. Now that you have
the sources on your machine the hard part is over. From now on, to update
your
sources all you have to do is cd into any directory in your repository and run
the <b>svn update</b> command.
- <screen>
-<note> To update your xdocs directory simply cd into the xdocs directory
+<note>To update your xdocs directory simply cd into the xdocs directory
and:</note>
-<read>C:\build\tomcat-connectors\>cd xdocs</read>
-<read>C:\build\tomcat-connectors\xdocs\>svn update</read>
-</screen>
+<source>C:\build\tomcat-connectors\> cd xdocs
+C:\build\tomcat-connectors\xdocs\> svn update
+</source>
</p>
</subsection>
<subsection name="STEP 3. Test your build environment">
@@ -121,38 +117,34 @@ and:</note>
Open a command prompt window and cd to the directory where you downloaded
the source. Now cd into the xdocs directory so that <b>Ant</b> can see the
<b>build.xml</b> file. Then from a command prompt, run the following:
-<screen>
-<read> </read>
-<read>C:\build\tomcat-connectors>cd xdocs</read>
-<read>C:\build\tomcat-connectors\xdocs>ant all</read>
-<read> </read>
-</screen>
+<source>C:\build\tomcat-connectors> cd xdocs
+C:\build\tomcat-connectors\xdocs> ant all
+</source>
</p>.
<p>
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\build\docs\news\printer></read>
-<read>[style] Processing C:\build\tomcat-connectors\xdocs\news\20041100.xml
-to</read>
-<read>C:\build\tomcat-connectors\build\docs\news/20041100.html</read>
-<read>[style] Loading stylesheet
C:\build\tomcat-connectors\xdocs\style.xsl</read>
-<read>[style] Processing C:\build\tomcat-connectors\xdocs\news\20050101.xml
-to</read>
-<read>C:\build\tomcat-connectors\build\docs\news/20050101.html</read>
-<read>[style] Processing C:\build\tomcat-connectors\xdocs\news\20060101.xml
-to</read>
-<read>C:\build\tomcat-connectors\build\docs\news/20060101.html</read>
-<read>[style] Transforming into C:\build\tomcat-connectors\build\docs></read>
-<read>[style] Processing C:\build\tomcat-connectors\xdocs\index.xml
-to</read>
-<read>C:\build\tomcat-connectors\build\docs\index.html</read>
-<read>[style] Loading stylesheet
C:\build\tomcat-connectors\xdocs\style.xsl</read>
-<read> </read>
-<read>BUILD SUCCESSFUL</read>
-<read>Total time: 10 seconds</read>
-<read>C:\build\tomcat-connectors></read>
-</screen>
+<source>[style] Transforming into
C:\build\tomcat-connectors\build\docs\news\printer>
+[style] Processing C:\build\tomcat-connectors\xdocs\news\20041100.xml
+to
+C:\build\tomcat-connectors\build\docs\news/20041100.html
+[style] Loading stylesheet C:\build\tomcat-connectors\xdocs\style.xsl
+[style] Processing C:\build\tomcat-connectors\xdocs\news\20050101.xml
+to
+C:\build\tomcat-connectors\build\docs\news/20050101.html
+[style] Processing C:\build\tomcat-connectors\xdocs\news\20060101.xml
+to
+C:\build\tomcat-connectors\build\docs\news/20060101.html
+[style] Transforming into C:\build\tomcat-connectors\build\docs>
+[style] Processing C:\build\tomcat-connectors\xdocs\index.xml
+to
+C:\build\tomcat-connectors\build\docs\index.html
+[style] Loading stylesheet C:\build\tomcat-connectors\xdocs\style.xsl
+
+BUILD SUCCESSFUL
+Total time: 10 seconds
+C:\build\tomcat-connectors>
+</source>
</p>
<p>
All the xml files present in the xdocs directory structure were
transformed
@@ -166,14 +158,12 @@ html files in your browser and see how i
I find it easier to use two windows while doing my updates. One I call my
<b>build</b> window. I keep this one in the
<b>SVN_HOME\tomcat-connectors\xdocs</b>
directory and I only run two commands in this window:
-<screen>
-<read> </read>
-<note> First I run</note>
-<read>ant clean</read>
-<note> Then I run</note>
-<read>ant all</read>
-<read> </read>
-</screen>
+<note>First I run</note>
+<source>ant clean
+</source>
+<note>Then I run</note>
+<source>ant all
+</source>
</p>
<p>
My second window I call my <b>edit</b> window and I keep that one in the
@@ -183,12 +173,10 @@ edits, diffs and svn updates.
<p>
Before you start editing you should always update your local repository to
prevent conflicts.
-<screen>
-<note> You only need to update the xdocs directory</note>
-<read>C:\build\tomcat-connectors>cd xdocs</read>
-<read>C:\build\tomcat-connectors\xdocs></read>
-<read>C:\build\tomcat-connectors\xdocs>svn update</read>
-</screen>
+<note>You only need to update the xdocs directory</note>
+<source>C:\build\tomcat-connectors> cd xdocs
+C:\build\tomcat-connectors\xdocs> svn update
+</source>
</p>
<p>
Now that your repository is up to date you can begin editing. Find
@@ -196,21 +184,15 @@ something in the documentation to edit.
name of the file. In your <b>edit</b> window find and edit the xml source
file
with the same name. After you are done return to the <b>build</b> window,
and
in the <b>SVN_HOME\tomcat-connectors\xdocs</b> directory run:
-<screen>
-<read> </read>
-<read>C:\build\tomcat-connectors\xdocs> ant clean</read>
-<read> </read>
-</screen>
+<source>C:\build\tomcat-connectors\xdocs> ant clean
+</source>
</p>
<p>
This will delete all the previous html files and make the area ready for
updated material. Now to make fresh documents that incorporate your changes
run:
-<screen>
-<read> </read>
-<read>C:\build\tomcat-connectors\xdocs>ant all</read>
-<read> </read>
-</screen>
+<source>C:\build\tomcat-connectors\xdocs> ant all
+</source>
</p>
<p>
Use your browser to view the edits you just made, they will be in the
@@ -225,11 +207,9 @@ all that is left to do is to create a pa
file you are working on, and run the <b>svn update</b> command. For example,
to produce a diff of the index.xml file and call it patch.txt, you
would cd into the directory containing the index.xml file and:
-<screen>
-<read>C:\build\tomcat-connectors\xdocs\>svn diff index.xml >
-patch.txt.</read>
-<read> </read>
-</screen>
+<source>C:\build\tomcat-connectors\xdocs\>svn diff index.xml >
+patch.txt.
+</source>
</p>
<p>
Now that you have your patch you are ready to send it in.
Modified: tomcat/jk/trunk/xdocs/miscellaneous/faq.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/faq.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/faq.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/faq.xml Thu Dec 13 22:03:14 2018
@@ -64,7 +64,6 @@ Tomcat Connectors (mod_jk, mod_jk2) Down
</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.
</p>
@@ -221,16 +220,15 @@ Chances are that if you are getting thes
that APXS is not configured correctly for your system.
Your best bet is to get the Apache source from the <a
href="http://httpd.apache.org/";>Apache HTTP Server homepage</a> and build it
yourself.
Use the following for a basic build (read the Apache docs for other options):
-<screen>
-<type>cd /usr/local/src</type><br/>
-<type>gzip -dc apache_1.3.19.tar.gz|tar xvf -</type><br/>
-<type>cd apache_1.3.19</type><br/>
-<type>./configure --prefix=/usr/local/apache \</type><br/>
-<type> --enable-module=most \</type><br/>
-<type> --enable-shared=max</type><br/>
-<type>make</type><br/>
-<type>make install</type><br/>
-</screen>
+<source>[user@host] ~ $ cd /usr/local/src
+[user@host] ~ $ gzip -dc apache_1.3.19.tar.gz|tar xvf -
+[user@host] ~ $ cd apache_1.3.19
+[user@host] ~ $ ./configure --prefix=/usr/local/apache \
+ --enable-module=most \
+ --enable-shared=max
+[user@host] ~ $ make
+[user@host] ~ $ make install
+</source>
</p>
<p>
Note: The above steps assume that you downloaded the Apache source and placed
it in your /usr/local/src directory.
@@ -275,9 +273,8 @@ You should verify if Apache 1.3 has been
the pthreads library to your <b>httpd.conf</b> file.
</p>
-<source>
- # Add pthread to Apache in httpd.conf
- LoadModule "/usr/lib/libpthreads.so"
+<source># Add pthread to Apache in httpd.conf
+LoadModule "/usr/lib/libpthreads.so"
</source>
<p>
@@ -292,18 +289,16 @@ to Apache 2.x to support JNI.
Under Linux, you should set some environment variables BEFORE launching your
Apache HTTP Server:
</p>
-<screen>
-<read>export LD_LIBRARY_PATH=$jre/bin:$jre/bin/classic:$LD_LIBRARY_PATH</read>
-</screen>
+<source>export LD_LIBRARY_PATH=$jre/bin:$jre/bin/classic:$LD_LIBRARY_PATH
+</source>
<p>
Also some Linux distributions have enabled a GLIBC feature called 'floating
stacks' which may not works with kernel
less than 2.4.10 on SMP machines. You should disable floating stacks by
exporting an environment variable:
</p>
-<screen>
-<read>export LD_ASSUME_KERNEL=2.2.5</read>
-</screen>
+<source>export LD_ASSUME_KERNEL=2.2.5
+</source>
<p>
You could have to update your service scripts, ie
<b>/etc/rc.d/init.d/httpd</b>, to set these env vars
Modified: tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml?rev=1848904&r1=1848903&r2=1848904&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/jkstatustasks.xml Thu Dec 13 22:03:14
2018
@@ -41,8 +41,7 @@ They can be used to manage the JK web se
<subsection name="Simple antlib integration">
<p>
-<source>
-<?xml version="1.0" encoding="UTF-8"?>
+<source><?xml version="1.0" encoding="UTF-8"?>
<project name="modjk-status"
xmlns:jk="urn:org-apache-jk-status"
@@ -80,8 +79,7 @@ They can be used to manage the JK web se
<subsection name="Test Result">
<p>
-<source>
-[echoproperties] #Ant properties
+<source>[echoproperties] #Ant properties
[echoproperties] #Sun Dec 10 20:40:21 CET 2006
[echoproperties] worker.node01.lbmult=1
[echoproperties] worker.loadbalancer.lock=Optimistic
@@ -161,54 +159,51 @@ They can be used to manage the JK web se
<subsection name="Update Load Balancer">
<p>
-<source>
- <target name="updatelb" >
- <jk:updateloadbalancer url="${jkstatus.url}"
- username="${jkstatus.username}"
- password="${jkstatus.password}"
- loadbalancer="loadbalancer"
- method="Busyness"
- retries="2"
- recoverWaitTime="60"
- lock="Optimistic"
- forceStickySession="false"
- stickySession="false"/>
- </target>
+<source><target name="updatelb" >
+<jk:updateloadbalancer url="${jkstatus.url}"
+ username="${jkstatus.username}"
+ password="${jkstatus.password}"
+ loadbalancer="loadbalancer"
+ method="Busyness"
+ retries="2"
+ recoverWaitTime="60"
+ lock="Optimistic"
+ forceStickySession="false"
+ stickySession="false"/>
+</target>
</source>
</p>
</subsection>
<subsection name="Update Worker">
<p>
-<source>
- <target name="updatew" >
- <jk:updateworker url="${jkstatus.url}"
- username="${jkstatus.username}"
- password="${jkstatus.password}"
- loadbalancer="loadbalancer"
- worker="node01"
- lbfactor="2"
- activation="Active"
- redirect=""
- domain=""
- route="node01"
- distance="0"/>
- </target>
+<source><target name="updatew" >
+<jk:updateworker url="${jkstatus.url}"
+ username="${jkstatus.username}"
+ password="${jkstatus.password}"
+ loadbalancer="loadbalancer"
+ worker="node01"
+ lbfactor="2"
+ activation="Active"
+ redirect=""
+ domain=""
+ route="node01"
+ distance="0"/>
+</target>
</source>
</p>
</subsection>
<subsection name="Reset Worker">
<p>
-<source>
- <target name="reset" >
- <jk:reset url="${jkstatus.url}"
- username="${jkstatus.username}"
- password="${jkstatus.password}"
- loadbalancer="loadbalancer"
- worker="node01"
- />
- </target>
+<source><target name="reset" >
+<jk:reset url="${jkstatus.url}"
+ username="${jkstatus.username}"
+ password="${jkstatus.password}"
+ loadbalancer="loadbalancer"
+ worker="node01"
+ />
+</target>
</source>
</p>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
