billbarker 2004/01/14 00:22:22
Modified: src/doc AJPv13.html JDBCRealm-howto.html
Tomcat-on-NetWare-HowTo.html mod_jk-howto.html
serverxml.html tomcat-security.html
tomcat-ssl-howto.html tomcat-ug.html
Log:
Fix '>' -> >.
Somebody clearly has way too much time on their hands to bother reporting something
like this :)
First part of bug #12307
Submitted By: Larry Shatzer [EMAIL PROTECTED]
Revision Changes Path
1.8 +4 -4 jakarta-tomcat/src/doc/AJPv13.html
Index: AJPv13.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/AJPv13.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AJPv13.html 29 Sep 2003 07:42:59 -0000 1.7
+++ AJPv13.html 14 Jan 2004 08:22:21 -0000 1.8
@@ -76,7 +76,7 @@
request informaton (e.g. HTTP headers, etc) is sent over the connection in
a highly condensed form (e.g. common strings are encoded as integers).
Details of that format are below in Request Packet Structure. If there is a
-body to the request (content-length > 0), that is sent in a separate
+body to the request (content-length > 0), that is sent in a separate
packet immediately after.
<P> At this point, the servlet container is presumably ready to start
@@ -164,7 +164,7 @@
<TABLE BORDER=1 CELLPADDING=2 CELLSPACING=0 BGCOLOR="#FFFFFF">
<TR>
- <TD COLSPAN=6><B>Packet Format (Server->Container)</B></TD>
+ <TD COLSPAN=6><B>Packet Format (Server->Container)</B></TD>
</TR>
<TR>
@@ -189,7 +189,7 @@
<TABLE BORDER=1 CELLPADDING=2 CELLSPACING=0 BGCOLOR="#FFFFFF">
<TR>
- <TD COLSPAN=6><B>Packet Format (Container->Server)</B></TD>
+ <TD COLSPAN=6><B>Packet Format (Container->Server)</B></TD>
</TR>
<TR>
@@ -582,7 +582,7 @@
<H2>Questions I Have</H2>
-<P> What happens if the request headers > max packet size? There is no
+<P> What happens if the request headers > max packet size? There is no
provision to send a second packet of request headers in case there are more
than 8K (I think this is correctly handled for response headers, though I'm
not certain). I don't know if there is a way to get more than 8K worth of
1.6 +7 -7 jakarta-tomcat/src/doc/JDBCRealm-howto.html
Index: JDBCRealm-howto.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/JDBCRealm-howto.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JDBCRealm-howto.html 7 Nov 2001 14:40:00 -0000 1.5
+++ JDBCRealm-howto.html 14 Jan 2004 08:22:21 -0000 1.6
@@ -81,7 +81,7 @@
<tr>
<td>
<pre>
-mysql> select * from users;
+mysql> select * from users;
+-----------+-----------+
| user_name | user_pass |
+-----------+-----------+
@@ -92,8 +92,8 @@
+-----------+-----------+
4 rows in set (0.00 sec)
-mysql>
-mysql> select * from roles;
+mysql>
+mysql> select * from roles;
+------------+
| role_name |
+------------+
@@ -102,10 +102,10 @@
+------------+
2 rows in set (0.02 sec)
-mysql>
+mysql>
-mysql> select * from user_roles;
+mysql> select * from user_roles;
+------------+-----------+
| role_name | user_name |
+------------+-----------+
@@ -116,7 +116,7 @@
+------------+-----------+
4 rows in set (0.00 sec)
-mysql>
+mysql>
</pre>
</td>
</tr>
1.6 +10 -10 jakarta-tomcat/src/doc/Tomcat-on-NetWare-HowTo.html
Index: Tomcat-on-NetWare-HowTo.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/Tomcat-on-NetWare-HowTo.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Tomcat-on-NetWare-HowTo.html 7 Nov 2002 13:23:32 -0000 1.5
+++ Tomcat-on-NetWare-HowTo.html 14 Jan 2004 08:22:21 -0000 1.6
@@ -98,22 +98,22 @@
<h2>
<a NAME="Document Conventions and Assumptions"></a>Document Conventions
and Assumptions</h2>
-<tomcat_home> is the root directory of Tomcat. By default this is at
+<tomcat_home> is the root directory of Tomcat. By default this is at
the root of the SYS: volume (SYS:\jakarta-tomcat-3.3 by default for Tomcat 3.3) but
it can be placed anywhere, on any volume.
Your installation should have the following sub-directories:
<ol>
<li>
-<tomcat_home>\conf - Where you can place various configuration files</li>
+<tomcat_home>\conf - Where you can place various configuration files</li>
<li>
-<tomcat_home>\webapps - Contains example applications and is the default
+<tomcat_home>\webapps - Contains example applications and is the default
place for adding your applications</li>
<li>
-<tomcat_home>\bin - Where you place web server connectors and startup
+<tomcat_home>\bin - Where you place web server connectors and startup
scripts</li>
</ol>
-In all the examples in this document, <tomcat_home> will be
+In all the examples in this document, <tomcat_home> will be
SYS:\jakarta-tomcat-3.3.
<p>A <b><tt>worker</tt></b> is the tomcat process that accepts work from
the web server.
@@ -174,9 +174,9 @@
<a NAME="Running Tomcat with the NetWare Enterprise Web Server"></a>2.
Running Tomcat with the NetWare Enterprise Web Server</h3>
To run Tomcat with the NetWare Enterprise Web Server, you need to download
-nsapi_rd.nlm and copy it to your NetWare server. A good location is
<tomcat_home>\bin\netscape\netware\i386.
+nsapi_rd.nlm and copy it to your NetWare server. A good location is
<tomcat_home>\bin\netscape\netware\i386.
You will then need to add the following to your obj.conf file located in
-SYS:\novonyx\suitespot\https-<servername>\config. This will tell the
+SYS:\novonyx\suitespot\https-<servername>\config. This will tell the
NetWare Enterprise Web Server to let Tomcat handle the /servlet/* and /examples/*
URIs.
<ol>
@@ -201,10 +201,10 @@
Create a new configuration object by adding the following 4 lines to the
end of the obj.conf file:</li>
-<br><tt><Object name="Tomcat"></tt>
+<br><tt><Object name="Tomcat"></tt>
<br><tt>ObjectType fn="force-type" type="text/plain"</tt>
<br><tt>Service fn="jk_service" worker="ajp13"</tt>
-<br><tt></Object></tt></ol>
+<br><tt></Object></tt></ol>
Now stop and restart the NetWare Enterprise Web Server, make sure that Tomcat is
running (i.e. run the <b>tomcat.ncf</b> file mentioned in <a href="#Running Tomcat
Standalone">Running
Tomcat Standalone</a>) and you should be
@@ -223,7 +223,7 @@
<tt><b>tomcat jkconf</tt></b> (i.e. run the <b>tomcat.ncf</b> file mentioned
in <a href="#Running Tomcat Standalone">Running Tomcat Standalone</a> with a
<tt><b>jkconf</tt></b> parameter) to generate the file
-<tomcat_home>/conf/auto/mod_jk.conf. Then add the following line to
+<tomcat_home>/conf/auto/mod_jk.conf. Then add the following line to
your httpd.conf file, replacing SYS:/jakarta-tomcat-3.3 with the directory
where Tomcat is installed:
<p>Include "SYS:/jakarta-tomcat-3.3/conf/auto/mod_jk.conf"</p>
1.17 +9 -9 jakarta-tomcat/src/doc/mod_jk-howto.html
Index: mod_jk-howto.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/mod_jk-howto.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_jk-howto.html 7 Nov 2002 13:23:32 -0000 1.16
+++ mod_jk-howto.html 14 Jan 2004 08:22:21 -0000 1.17
@@ -44,7 +44,7 @@
<h1>
Working with mod_jk</h1>
-By Gal Shachor <tt><<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>></tt>
+By Gal Shachor <tt><<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>></tt>
<h2>
Table of Contents</h2>
@@ -522,7 +522,7 @@
as the workers or URL prefix.
<p>Use mod_jk's JkMount directive to assign specific URLs to Tomcat. In
general the structure of a JkMount directive is:
-<pre>JkMount <i><URL prefix></i> <i><Worker name></i></pre>
+<pre>JkMount <i><URL prefix></i> <i><Worker name></i></pre>
For example the following directives will send all requests ending in
<tt>.jsp</tt>
or beginning with <tt>/servlet</tt> to the "<tt>ajp13</tt>" worker, but
@@ -532,7 +532,7 @@
JkMount /servlet/* ajp13
JkMount /otherworker/*.jsp remoteworker</pre>
</blockquote>
-You can use the <tt>JkMount</tt> directive at the top level or inside
<tt><VirtualHost></tt>
+You can use the <tt>JkMount</tt> directive at the top level or inside
<tt><VirtualHost></tt>
sections of your httpd.conf file.</div>
<hr>
@@ -784,24 +784,24 @@
ServerName host1.apache.org
JkMount /*.jsp ajp13
JkMount /servlet/* ajp13
-</VirtualHost>
+</VirtualHost>
# Second Virtual Host. Also accessible via HTTPS
#
-<VirtualHost 10.0.0.2:80>
+<VirtualHost 10.0.0.2:80>
DocumentRoot /web/host2
ServerName host2.apache.org
JkMount /*.jsp ajp13
JkMount /servlet/* ajp13
-</VirtualHost>
+</VirtualHost>
-<VirtualHost 10.0.0.2:443>
+<VirtualHost 10.0.0.2:443>
DocumentRoot /web/host2
ServerName host2.apache.org
SSLEngine On
JkMount /*.jsp ajp13
JkMount /servlet/* ajp13
-</VirtualHost>
+</VirtualHost>
</pre>
</blockquote>
@@ -976,7 +976,7 @@
<a href="mailto:[EMAIL PROTECTED]">Gal
Shachor</a>
<p>Revisions by (Alphabetical)
-<p>Mike Braden <tt><<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>></tt>
+<p>Mike Braden <tt><<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>></tt>
<br>Mike Bremford
<br>Chris Pepper
<p>With help from countless others on the tomcat-dev and tomcat-user lists!
1.33 +4 -4 jakarta-tomcat/src/doc/serverxml.html
Index: serverxml.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/serverxml.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- serverxml.html 29 Sep 2003 07:42:59 -0000 1.32
+++ serverxml.html 14 Jan 2004 08:22:21 -0000 1.33
@@ -344,8 +344,8 @@
"combined" (Apache httpd combined format, default),
"common" (Apache httpd common format) or a format string like
<pre>
- '%h %l %u %t "%r" %>s %b "%{Referer}"
"%{User-Agent}"'
- '%h %l %u %t "%r" %>s %b'
+ '%h %l %u %t "%r" %>s %b "%{Referer}"
"%{User-Agent}"'
+ '%h %l %u %t "%r" %>s %b'
</pre>
(The above examples are used when "combined" or "common"
format is requested.) Possible patterns are:
@@ -391,7 +391,7 @@
<td>The value of <code>response.getStatus()</code>.</td>
</tr>
<tr>
- <th valign="top">%>s</th>
+ <th valign="top">%>s</th>
<td>The value of <code>response.getStatus()</code>.
Should differ between different internal requests, as
Apache httpd does, but this is currently not supported.</td>
1.6 +3 -3 jakarta-tomcat/src/doc/tomcat-security.html
Index: tomcat-security.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-security.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat-security.html 18 Apr 2002 13:58:00 -0000 1.5
+++ tomcat-security.html 14 Jan 2004 08:22:21 -0000 1.6
@@ -50,7 +50,7 @@
<p>Imagine if someone who is authorized to publish JSP's on your site inadvertently
included the following in their JSP:
<blockquote>
-<pre><% System.exit(1); %></pre>
+<pre><% System.exit(1); %></pre>
</blockquote>
<p><br>Every time that JSP was executed by Tomcat, Tomcat would exit.
@@ -114,8 +114,8 @@
format as follows:
<table border=0><tr><td><pre>// Example policy file entry
-grant [signedBy <signer> [,codeBase <code source>] {
- permission <class> [<name> [, <action list>]];
+grant [signedBy <signer> [,codeBase <code source>] {
+ permission <class> [<name> [, <action list>]];
};
</td></tr></table></pre>
The <b>signedBy</b> and <b>codeBase </b>entries are optional when granting
permissions.
1.15 +16 -16 jakarta-tomcat/src/doc/tomcat-ssl-howto.html
Index: tomcat-ssl-howto.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ssl-howto.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tomcat-ssl-howto.html 7 Nov 2002 13:23:32 -0000 1.14
+++ tomcat-ssl-howto.html 14 Jan 2004 08:22:21 -0000 1.15
@@ -319,7 +319,7 @@
<br><font face="Courier New, Courier, mono"><font size=-1>JkLogLevel
warn</font></font>
<p>The jk redirect stuff can be set in virtual hosts: <virtualhost
_default_:443>
<p><font face="Courier New, Courier, mono"><font size=-1><VirtualHost
-_default_:443></font></font>
+_default_:443></font></font>
<br><font face="Courier New, Courier, mono"><font size=-1>SSLEngine on</font></font>
<br><font face="Courier New, Courier, mono"><font size=-1>SSLCipherSuite
ALL:!ADH:!EXP56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL</font></font>
@@ -337,12 +337,12 @@
ajp13 </font></font><location "/alesia/WEB-INF/">
<br></location>
<br><font face="Courier New, Courier, mono"><font size=-1><Location
-"/alesia/WEB-INF/"></font></font>
+"/alesia/WEB-INF/"></font></font>
<br><font face="Courier New, Courier, mono"><font size=-1>AllowOverride
None</font></font>
<br><font face="Courier New, Courier, mono"><font size=-1>Deny from
all</font></font>
-<br><font face="Courier New, Courier, mono"><font
size=-1></Location></font></font>
-<p><font face="Courier New, Courier, mono"><font
size=-1></VirtualHost></font></font><virtualhost _default_:443></virtualhost>
+<br><font face="Courier New, Courier, mono"><font
size=-1></Location></font></font>
+<p><font face="Courier New, Courier, mono"><font
size=-1></VirtualHost></font></font><virtualhost _default_:443></virtualhost>
<br>
<hr>
@@ -473,7 +473,7 @@
<br><tt><font size=-1>What is the two-letter country code for this unit?</font></tt>
<br><tt><font size=-1> [Unknown]: FR</font></tt>
<br><tt><font size=-1>Is <CN=www.vercingetorix.org, OU=Chief, O=Gaulois,
-L=Alesia, ST=50, C=FR> correct?</font></tt>
+L=Alesia, ST=50, C=FR> correct?</font></tt>
<br><tt><font size=-1> [no]: yes</font></tt>
<br><br>
@@ -575,7 +575,7 @@
certificates in separate files, such as <code>key.pem</code>
and <code>cert.pem</code>. PureTLS expects a single file which
you can create by just concatenating the two files. For instance:
-<code>cat key.pem cert.pem > keyfile.pem</code>.
+<code>cat key.pem cert.pem > keyfile.pem</code>.
<p>
PureTLS does not currently allow you to make self-signed certificates.
However, a number of sample certificate files are included in the
@@ -603,23 +603,23 @@
as shipped with Tomcat, contains a simple example which is commented-out by
default).
<BLOCKQUOTE>
<p>Syntax for Tomcat 3.2 :
-<p><tt><font size=-1><Connector
className="org.apache.tomcat.service.PoolTcpConnector"></font></tt>
-<br><tt><font size=-1><Parameter name="handler"
value="org.apache.tomcat.service.http.HttpConnectionHandler"/></font></tt>
-<br><tt><font size=-1><Parameter name="port" value="8443"/></font></tt>
+<p><tt><font size=-1><Connector
className="org.apache.tomcat.service.PoolTcpConnector"></font></tt>
+<br><tt><font size=-1><Parameter name="handler"
value="org.apache.tomcat.service.http.HttpConnectionHandler"/></font></tt>
+<br><tt><font size=-1><Parameter name="port" value="8443"/></font></tt>
<br><tt><font size=-1><Parameter name="socketFactory"
value="org.apache.tomcat.net.SSLSocketFactory"
-/></font></tt>
+/></font></tt>
<br><tt><font size=-1><Parameter name="keystore"
value="/var/tomcat/conf/keystore"
-/></font></tt>
-<br><tt><font size=-1><Parameter name="keypass" value="mynewpass"/></font></tt>
-<br><tt><font size=-1><Parameter name="clientAuth" value="false"/></font></tt>
-<br><tt><font size=-1></Connector></font></tt><tt></tt>
+/></font></tt>
+<br><tt><font size=-1><Parameter name="keypass"
value="mynewpass"/></font></tt>
+<br><tt><font size=-1><Parameter name="clientAuth" value="false"/></font></tt>
+<br><tt><font size=-1></Connector></font></tt><tt></tt>
<p>Syntax for Tomcat 3.3 :
<p><tt><font size=-1><Http10Connector</font></tt>
<br><tt><font size=-1> port="8443"</font></tt>
<br><tt><font size=-1> secure="true"</font></tt>
<br><tt><font size=-1> keystore="/var/tomcat/conf/keystore"</font></tt>
<br><tt><font size=-1> keypass="mynewpass"</font></tt>
-<br><tt><font size=-1> clientauth="false" /></font></tt><font size=-1></font>
+<br><tt><font size=-1> clientauth="false" /></font></tt><font
size=-1></font>
</BLOCKQUOTE>
In the above examples, we indicate that the keystore is file located at
<code>/var/tomcat/conf/keystore</code>, and the password if "mynewpass". Again,
@@ -642,7 +642,7 @@
<br><tt><font size=-1> keystore="/var/tomcat/conf/keystore"</font></tt>
<br><tt><font size=-1> keypass="mynewpass"</font></tt>
<br><tt><font size=-1> clientauth="false" </font></tt>
-<br><tt><font size=-1>
SSLImplementation="org.apache.tomcat.util.net.PureTLSImplementation" </font></tt>
/></font></tt>
+<br><tt><font size=-1>
SSLImplementation="org.apache.tomcat.util.net.PureTLSImplementation" </font></tt>
/></font></tt>
<P>
<code>SSLImplementation</code> can be the name of any class that implements
<code>org.apache.tomcat.util.net.SSLImplementation</code>. The values built
1.27 +5 -5 jakarta-tomcat/src/doc/tomcat-ug.html
Index: tomcat-ug.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/tomcat-ug.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- tomcat-ug.html 7 Nov 2002 13:23:32 -0000 1.26
+++ tomcat-ug.html 14 Jan 2004 08:22:21 -0000 1.27
@@ -334,11 +334,11 @@
<br><br>
<ol>
<li>A global solution is to add a "SHELL" command to your
- <code>CONFIG.SYS</code> file. Click Start -> Run and
+ <code>CONFIG.SYS</code> file. Click Start -> Run and
enter <code>sysedit</code>. Then click OK. In the
<code>C:\CONFIG.SYS</code> window, add the line:
<pre>SHELL=C:\COMMAND.COM /E:4096 /P</pre>
- and click File -> Save. Then click File -> Exit and
+ and click File -> Save. Then click File -> Exit and
reboot your system. The default amount of environment space will
now be 4096 bytes, more than enough for Tomcat.</li>
<li>If you plan on always starting Tomcat 3.3 from the
@@ -1036,7 +1036,7 @@
by the <strong>modules</strong> that are included by <code>server.xml</code>
and associated files. The primary example of this is <code>ContextXmlReader</code>.
It is responsible for reading files containing Context declarations in the form:</p>
-<pre><Context path="/myapp" docBase="<i>somepath</i>" ...
/></pre> or
+<pre><Context path="/myapp" docBase="<i>somepath</i>" ...
/></pre> or
<pre><Context path="/myapp" docBase="<i>somepath</i>" ...>
<i>context local modules</i>
</Context></pre>
@@ -1260,7 +1260,7 @@
<li><a href="#cust_chgports">Change ports for Http, Https, and Web Server
connectors</a></li>
<li><a href="#cust_session">Speed up initial session creation for
development</a></li>
<li><a href="#cust_auth">Configure whether Tomcat or a web server does
authentication</a></li>
-<li><a href="#cust_dirlist">Turn off directory listings></li>
+<li><a href="#cust_dirlist">Turn off directory listings</li>
<li><a href="#cust_jikes">Use Jikes as the Java compiler</a></li>
<li><a href="#cust_bind">Bind a connector to a single IP address</a></li>
<li><a href="#cust_redeploy">Enable redeploying of WAR files</a></li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
