Author: remm
Date: Thu Aug 17 06:38:32 2006
New Revision: 432237
URL: http://svn.apache.org/viewvc?rev=432237&view=rev
Log:
- Port docs updates.
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/appdev/installation.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/index.xml
tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml
tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/installation.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/installation.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/installation.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/installation.xml Thu Aug 17
06:38:32 2006
@@ -17,15 +17,13 @@
<section name="Installation">
-<p>In order to use Tomcat 5 for developing web applications, you must first
+<p>In order to use Tomcat 6 for developing web applications, you must first
install it (and the software it depends on). The required steps are outlined
in the following subsections.</p>
<subsection name="JDK">
-<p>Tomcat 5.5 was designed to run on J2SE 5.0, but it can run on JDK 1.4
-as well, using the compatability package as detailed in the Tomcat
-installation instructions.
+<p>Tomcat 6.0 was designed to run on J2SE 5.0.
</p>
<p>Compatible JDKs for many platforms (or links to where they can be found)
@@ -37,14 +35,14 @@
<subsection name="Tomcat">
<p>Binary downloads of the <strong>Tomcat</strong> server are available from
-<a
href="http://jakarta.apache.org/binindex.cgi";>http://jakarta.apache.org/binindex.cgi</a>.
+<a
href="http://tomcat.apache.org/download-60.cgi";>http://tomcat.apache.org/download-60.cgi</a>.
This manual assumes you are using the most recent release
-of Tomcat 5. Detailed instructions for downloading and installing
-Tomcat 5 are available <a href="../setup.html">here</a>.</p>
+of Tomcat 6. Detailed instructions for downloading and installing
+Tomcat 6 are available <a href="../setup.html">here</a>.</p>
<p>In the remainder of this manual, example shell scripts assume that you have
set an environment variable <code>CATALINA_HOME</code> that contains the
-pathname to the directory in which Tomcat 5 has been installed.</p>
+pathname to the directory in which Tomcat 6 has been installed.</p>
</subsection>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml Thu Aug 17 06:38:32
2006
@@ -118,7 +118,7 @@
app.path=/hello
# Tomcat 5 installation directory
-catalina.home=/usr/local/jakarta-tomcat-5.0
+catalina.home=/usr/local/apache-tomcat-6.0
# Manager webapp username and password
manager.username=myusername
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Aug 17 06:38:32 2006
@@ -14,6 +14,107 @@
<body>
+<section name="Tomcat 5.5.18 (yoavs)">
+ <subsection name="General">
+ <changelog>
+ <update>
+ Change MD5 release signature files to have md5 (lowercase) extension
instead of MD5 (uppercase),
+ as suggested by Henk Penning and specified in the
+ <a href="http://www.apache.org/dev/release-publishing.html";>ASF
release publishing guidelines</a>. (yoavs)
+ </update>
+ </changelog>
+ </subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix that ManagerBase increment expireSessions counter at background
task two times. (pero)
+ </fix>
+ <fix>
+ <bug>39406</bug>: Fix that StandardSession#getLastAccessedTime() uses
correct exception message,
+ suggested by Takayoshi Kimura. (pero)
+ </fix>
+ <add>
+ <bug>39661</bug>: Add documentation on JULI FileHandler properties.
(yoavs)
+ </add>
+ <add>
+ <bug>39657</bug>: Warn (and don't load jar) if JSP API is in webapp
classloader repository, as suggested by
+ David Sanchez Crespillo. (yoavs)
+ </add>
+ <add>
+ <bug>39674</bug>: Support JRockit JVM in service.bat script, as
suggested by lizongbo. (yoavs)
+ </add>
+ <fix>
+ <bug>39711</bug>: Update Loader configuration documentation, as
suggested by Stephane Bailliez. (yoavs)
+ </fix>
+ <fix>
+ <bug>39865</bug>: Add Open Office mime types to conf/web.xml. (markt)
+ </fix>
+ <fix>
+ <bug>38814</bug>: Align CGI handling of indexed queries, parameters and
+ POST content with other CGI providers. The changes: only provide
+ parameters on the command line for indexed queries; always provide the
+ query string via the QUERY_STRING environment variable; provide POST
+ content unmodified to stdin; and never call getParameters(). (markt)
+ </fix>
+ <fix>
+ <bug>34801</bug>: Partial fix that adds handling of IOExceptions during
+ long running CGI requests. Based on a patch by Chris Davey. (markt)
+ </fix>
+ <fix>
+ <bug>39689</bug>: Allow single quotes (') and backticks (`) as well as
+ double quotes (") to be used to delimit SSI attribute values. (markt)
+ </fix>
+ <fix>
+ <bug>40053</bug>: Correct application deployment documentation so it
+ agrees with the classloader documentation regarding shared lib and
+ CATALINA_BASE. (markt)
+ </fix>
+ <fix>
+ <bug>39592</bug>: Stop HEAD requests for resources handled by SSI
+ servlet or filter generating stack traces in the logs. (markt)
+ </fix>
+ <fix>
+ Improve handling of the ';' character in the URL so that it is now
+ allowed if properly %xx encoded. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Fix APR endpoint so that the acceptor thread now only processes socket
+ accepts. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>39813</bug>: Correct handling of new line characters in JMX
+ attributes. Patch provided by R Bramley. (markt)
+ </fix>
+ <fix>
+ <bug>37781</bug>: Make sure that StoreConfig save external referenced
war files at context.xml correct. (pero)
+ </fix>
+ <fix>
+ <bug>39791</bug>: Use correct default for useNaming within a Context.
(markt)
+ </fix>
+ <fix>
+ Correctly generate re-direct for admin app index.jsp to prevent login
page
+ being displayed twice when cookies are disabled. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>39473</bug>: Session timeout much shorter than setting
+ at web.xml at cluster environment, suggested by Jin Jiang. (pero)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="Tomcat 5.5.17 (yoavs)">
<subsection name="General">
<changelog>
@@ -225,7 +326,7 @@
</fix>
<fix>
Allow using a custom ContextConfig when using JMX embedding of Tomcat,
as
- is doen by the regular deployer. (remm)
+ is done by the regular deployer. (remm)
</fix>
<add>
Add JMX serverInfo attribute to Server MBean, that we can identify
Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Thu Aug 17 06:38:32 2006
@@ -120,7 +120,7 @@
- Reference manual that documents all available elements and attributes
that may be placed into a Apache Tomcat 5 <code>conf/server.xml</code>
file.
</li>
-<li><a
href="http://jakarta.apache.org/tomcat/connectors-doc/index.html";><strong>JK
Documentation</strong></a>
+<li><a href="http://tomcat.apache.org/connectors-doc/index.html";><strong>JK
Documentation</strong></a>
- Complete documentation and HOWTOs on the JK native webserver connector,
used to interface Apache Tomcat with servers like Apache HTTPd, IIS
and others.</li>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml Thu Aug 17 06:38:32 2006
@@ -99,21 +99,21 @@
to fully read the relevant documentation as it will save you much time
and effort. There's nothing like scouring the web only to find out that
the answer was right in front of you all along!</li>
-<li><a href="http://jakarta.apache.org/tomcat/faq/";>Tomcat FAQ</a> as
maintained by the developers.</li>
-<li><a href="http://wiki.apache.org/jakarta-tomcat/";>Tomcat WIKI</a></li>
+<li><a href="http://tomcat.apache.org/faq/";>Tomcat FAQ</a> as maintained by
the developers.</li>
+<li><a href="http://wiki.apache.org/tomcat/";>Tomcat WIKI</a></li>
<li>Tomcat FAQ at <a
href="http://www.jguru.com/faq/home.jsp?topic=Tomcat";>jGuru</a></li>
<li>Tomcat mailing list archives - numerous sites archive the Tomcat mailing
lists. Since the links change over time, clicking here will search
<a
href="http://www.google.com/search?q=tomcat+mailing+list+archives";>Google</a>.
</li>
<li>The TOMCAT-USER mailing list, which you can subscribe to
- <a href="http://jakarta.apache.org/site/mail.html";>here</a>. If you don't
+ <a href="http://tomcat.apache.org/lists.html";>here</a>. If you don't
get a reply, then there's a good chance that your question was probably
answered in the list archives or one of the FAQs. Although questions
about web application development in general are sometimes asked and
answered, please focus your questions on Tomcat-specific issues.</li>
<li>The TOMCAT-DEV mailing list, which you can subscribe to
- <a href="http://jakarta.apache.org/site/mail.html";>here</a>. This list is
+ <a href="http://tomcat.apache.org/lists.html";>here</a>. This list is
<strong>reserved</strong> for discussions about the development of Tomcat
itself. Questions about Tomcat configuration, and the problems you run
into while developing and running applications, will normally be more
Modified: tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/monitoring.xml Thu Aug 17 06:38:32 2006
@@ -88,8 +88,8 @@
<li>Start your tomcat and look with a browser at
http://${JMX.HOST}:${JMX.PORT}</li>
<li>With the mx connector parameter <code>mx.authMode="basic"
mx.authUser="tomcat" mx.authPassword="strange"</code>
you can control the access!</li>
- <li>A complete list of all tomcat core MBeans can you find at <a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/mbean-names.html";>
-
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/mbean-names.html</a>.</li>
+ <li>A complete list of all tomcat core MBeans can you find at <a
href="funcspecs/mbean-names.html">
+ funcspecs/mbean-names.html</a>.</li>
</ol>
</p>
@@ -534,8 +534,7 @@
<tr>
<td>operation</td>
<td>Existing Mbean operation (see Tomcat
- <a
href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/fs-admin-opers.html";>
-
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/fs-admin-opers.html</a>.
+ <a
href="funcspecs/fs-admin-opers.html">funcspecs/fs-admin-opers.html</a>.
</td>
<td></td>
</tr>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/ssl-howto.xml Thu Aug 17 06:38:32 2006
@@ -208,12 +208,12 @@
is Java's standard "Java KeyStore" format, and is the format created by the
<code>keytool</code> command-line utility. This tool is included in the JDK.
The <code>PKCS12</code> format is an internet standard, and can be manipulated
-via (among other things) OpenSSL and Microsoft's Key-Manager. However,
-currently there are some limitations on the support for <code>PKCS12</code>.
+via (among other things) OpenSSL and Microsoft's Key-Manager.
</p>
<p>To import an existing certificate into a JKS keystore, please read the
documentation (in your JDK documentation package) about <code>keytool</code>.
+Note that openssl often adds a readable comments before the key,
<code>keytool</code>does not support that, so remove the openssl comments if
they exist before importing the key using <code>keytool</code>.
</p>
<p>To import an existing certificate signed by your own CA into a PKCS12
keystore using OpenSSL you would execute a command like:
@@ -399,6 +399,12 @@
TrustStore then you are using for the KeyStore. The valid values are
<code>JKS</code> and <code>PKCS12</code>.</td>
</tr>
+ <tr>
+ <td><code>keyAlias</code></td>
+ <td>Add this element if your have more than one key in the KeyStore.
+ If the element is not present the first key read in the KeyStore
+ will be used.</td>
+ </tr>
</table>
<p>After completing these configuration changes, you must restart Tomcat as
@@ -517,7 +523,7 @@
<strong>TOMCAT-USER</strong> mailing list. You can find pointers to archives
of previous messages on this list, as well as subscription and unsubscription
information, at
-<a
href="http://jakarta.apache.org/site/mail.html";>http://jakarta.apache.org/site/mail.html";</a>.</p>
+<a
href="http://tomcat.apache.org/lists.html";>http://tomcat.apache.org/lists.html</a>.</p>
</section>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=432237&r1=432236&r2=432237&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Thu Aug 17
06:38:32 2006
@@ -18,14 +18,14 @@
<b>This section of the documentation applies to procrun 1.0, and is now
obsolete.</b>
</p>
</section>
-<section name="Tomcat5 service application">
+<section name="Tomcat6 service application">
<p>
- <b>Tomcat5</b> is a service application for running Tomcat5 as NT service.
+ <b>Tomcat6</b> is a service application for running Tomcat6 as NT service.
</p>
</section>
-<section name="Tomcat5w monitor application">
+<section name="Tomcat6w monitor application">
<p>
- <b>Tomcat5w</b> is a GUI application for monitoring and configuring Tomcat
+ <b>Tomcat6w</b> is a GUI application for monitoring and configuring Tomcat
services.
</p>
<p>The available command line options are:</p>
@@ -54,7 +54,7 @@
<td>Run the service as console application</td>
<td>This is the default operation. It is called if the no option is
provided. The ServiceName is the name of the executable without
- exe sufix, meaning Tomcat5</td>
+ exe sufix, meaning Tomcat6</td>
</tr>
<tr><th>//RS//</th>
<td>Run the service</td>
@@ -289,18 +289,18 @@
</p>
<p>
<source>
-Install the service named 'Tomcat5'
+Install the service named 'Tomcat6'
C:\> service.bat install
</source>
</p>
<p>
-If using tomcat5.exe, you need to use the <b>//IS//</b> parameter.
+If using tomcat6.exe, you need to use the <b>//IS//</b> parameter.
</p>
<p>
<source>
-Install the service named 'Tomcat5'
-C:\> tomcat5 //IS//Tomcat5 --DisplayName="Apache Tomcat 5" \
-C:\> --Install="C:\Program Files\Tomcat\bin\tomcat5.exe" --Jvm=auto \
+Install the service named 'Tomcat6'
+C:\> tomcat6 //IS//Tomcat6 --DisplayName="Apache Tomcat 6" \
+C:\> --Install="C:\Program Files\Tomcat\bin\tomcat6.exe" --Jvm=auto \
C:\> --StartMode=jvm --StopMode=jvm \
C:\> --StartClass=org.apache.catalina.startup.Bootstrap --StartParams=start \
C:\> --StopClass=org.apache.catalina.startup.Bootstrap --StopParams=stop
@@ -313,8 +313,8 @@
</p>
<p>
<source>
-Update the service named 'Tomcat5
-C:\> tomcat5 //US//Tomcat5 --Description="Apache Tomcat Server -
http://jakarta.apache.org/tomcat " \
+Update the service named 'Tomcat6
+C:\> tomcat6 //US//Tomcat6 --Description="Apache Tomcat Server -
http://tomcat.apache.org/ " \
C:\> --Startup=auto
--Classpath=%JAVA_HOME%\lib\tools.jar;%CATALINA_HOME%\bin\bootstrap.jar
</source>
</p>
@@ -326,8 +326,8 @@
</p>
<p>
<source>
-Remove the service named 'Tomcat5'
-C:\> tomcat5 //DS//Tomcat5
+Remove the service named 'Tomcat6'
+C:\> tomcat6 //DS//Tomcat6
</source>
</p>
</section>
@@ -336,15 +336,15 @@
To run the service in console mode, you need to use the <b>//TS//</b>
parameter.
The service shutdown can be initiated by pressing <b>CTRL+C</b> or
<b>CTRL+BREAK</b>.
-If you rename the tomcat5.exe to testservice.exe then you can just execute the
+If you rename the tomcat6.exe to testservice.exe then you can just execute the
testservice.exe and this command mode will be executed by default.
</p>
<p>
<source>
-Run the service named 'Tomcat5' in console mode
-C:\> tomcat5 //TS//Tomcat5 [additional arguments]
+Run the service named 'Tomcat6' in console mode
+C:\> tomcat6 //TS//Tomcat6 [additional arguments]
Or simply execute:
-C:\> tomcat5
+C:\> tomcat6
</source>
</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
