In order to use Tomcat 5 for developing web applications, you must first +

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.

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. +

Tomcat 6.0 was designed to run on J2SE 5.0.

Compatible JDKs for many platforms (or links to where they can be found) @@ -37,14 +35,14 @@ are available at

Binary downloads of the Tomcat server are available from -http://jakarta.apache.org/binindex.cgi. +http://tomcat.apache.org/download-60.cgi. This manual assumes you are using the most recent release -of Tomcat 5. Detailed instructions for downloading and installing -Tomcat 5 are available here.

+of Tomcat 6. Detailed instructions for downloading and installing +Tomcat 6 are available here.

In the remainder of this manual, example shell scripts assume that you have set an environment variable CATALINA_HOME that contains the -pathname to the directory in which Tomcat 5 has been installed.

+pathname to the directory in which Tomcat 6 has been installed.

diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml index e11494eb6..7937a584e 100644 --- a/webapps/docs/appdev/processes.xml +++ b/webapps/docs/appdev/processes.xml @@ -118,7 +118,7 @@ You might end up with something like this:

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 diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 4a303ff33..b17a22a34 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -14,6 +14,107 @@ +

+ + + + Change MD5 release signature files to have md5 (lowercase) extension instead of MD5 (uppercase), + as suggested by Henk Penning and specified in the + ASF release publishing guidelines. (yoavs) + + + + + + + Fix that ManagerBase increment expireSessions counter at background task two times. (pero) + + + 39406: Fix that StandardSession#getLastAccessedTime() uses correct exception message, + suggested by Takayoshi Kimura. (pero) + + + 39661: Add documentation on JULI FileHandler properties. (yoavs) + + + 39657: Warn (and don't load jar) if JSP API is in webapp classloader repository, as suggested by + David Sanchez Crespillo. (yoavs) + + + 39674: Support JRockit JVM in service.bat script, as suggested by lizongbo. (yoavs) + + + 39711: Update Loader configuration documentation, as suggested by Stephane Bailliez. (yoavs) + + + 39865: Add Open Office mime types to conf/web.xml. (markt) + + + 38814: 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) + + + 34801: Partial fix that adds handling of IOExceptions during + long running CGI requests. Based on a patch by Chris Davey. (markt) + + + 39689: Allow single quotes (') and backticks (`) as well as + double quotes (") to be used to delimit SSI attribute values. (markt) + + + 40053: Correct application deployment documentation so it + agrees with the classloader documentation regarding shared lib and + CATALINA_BASE. (markt) + + + 39592: Stop HEAD requests for resources handled by SSI + servlet or filter generating stack traces in the logs. (markt) + + + Improve handling of the ';' character in the URL so that it is now + allowed if properly %xx encoded. (remm) + + + + + + + Fix APR endpoint so that the acceptor thread now only processes socket + accepts. (remm) + + + + + + + 39813: Correct handling of new line characters in JMX + attributes. Patch provided by R Bramley. (markt) + + + 37781: Make sure that StoreConfig save external referenced war files at context.xml correct. (pero) + + + 39791: Use correct default for useNaming within a Context. (markt) + + + Correctly generate re-direct for admin app index.jsp to prevent login page + being displayed twice when cookies are disabled. (markt) + + + + + + + 39473: Session timeout much shorter than setting + at web.xml at cluster environment, suggested by Jin Jiang. (pero) + + + +

@@ -225,7 +326,7 @@ 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) Add JMX serverInfo attribute to Server MBean, that we can identify diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml index 0254c99d9..cddc1b6c0 100644 --- a/webapps/docs/index.xml +++ b/webapps/docs/index.xml @@ -120,7 +120,7 @@ are responsible for installing, configuring, and operating a Apache Tomcat 5 ser - Reference manual that documents all available elements and attributes that may be placed into a Apache Tomcat 5 conf/server.xml file. -

JK Documentation +

JK Documentation - Complete documentation and HOWTOs on the JK native webserver connector, used to interface Apache Tomcat with servers like Apache HTTPd, IIS and others.

diff --git a/webapps/docs/introduction.xml b/webapps/docs/introduction.xml index c9ab051b2..c8b022110 100644 --- a/webapps/docs/introduction.xml +++ b/webapps/docs/introduction.xml @@ -99,21 +99,21 @@ different.

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! -

Tomcat FAQ as maintained by the developers.

Tomcat WIKI

Tomcat FAQ as maintained by the developers.

Tomcat WIKI

Tomcat FAQ at jGuru

Tomcat mailing list archives - numerous sites archive the Tomcat mailing lists. Since the links change over time, clicking here will search Google.

The TOMCAT-USER mailing list, which you can subscribe to - here. If you don't + here. 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.

The TOMCAT-DEV mailing list, which you can subscribe to - here. This list is + here. This list is reserved 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 diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml index e6cdae8c9..3b9f59921 100644 --- a/webapps/docs/monitoring.xml +++ b/webapps/docs/monitoring.xml @@ -88,8 +88,8 @@ controlRole tomcat

Start your tomcat and look with a browser at http://${JMX.HOST}:${JMX.PORT}

With the mx connector parameter mx.authMode="basic" mx.authUser="tomcat" mx.authPassword="strange" you can control the access!

A complete list of all tomcat core MBeans can you find at - http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/mbean-names.html.

A complete list of all tomcat core MBeans can you find at + funcspecs/mbean-names.html.

@@ -534,8 +534,7 @@ List of Attributes
operation Existing Mbean operation (see Tomcat - - http://jakarta.apache.org/tomcat/tomcat-5.5-doc/catalina/funcspecs/fs-admin-opers.html. + funcspecs/fs-admin-opers.html. diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml index b1e917ad2..188c06988 100644 --- a/webapps/docs/ssl-howto.xml +++ b/webapps/docs/ssl-howto.xml @@ -208,12 +208,12 @@ format keystores. The JKS format is Java's standard "Java KeyStore" format, and is the format created by the keytool command-line utility. This tool is included in the JDK. The PKCS12 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 PKCS12. +via (among other things) OpenSSL and Microsoft's Key-Manager.

To import an existing certificate into a JKS keystore, please read the documentation (in your JDK documentation package) about keytool. +Note that openssl often adds a readable comments before the key, keytooldoes not support that, so remove the openssl comments if they exist before importing the key using keytool.

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 @@ values, depending on how you configured your keystore earlier:

TrustStore then you are using for the KeyStore. The valid values are JKS and PKCS12. + + keyAlias + 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. +

After completing these configuration changes, you must restart Tomcat as @@ -517,7 +523,7 @@ SSL communications, and what to do about them.

TOMCAT-USER mailing list. You can find pointers to archives of previous messages on this list, as well as subscription and unsubscription information, at -http://jakarta.apache.org/site/mail.html".

+http://tomcat.apache.org/lists.html.

diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml index 82bf0485b..5bce075c5 100644 --- a/webapps/docs/windows-service-howto.xml +++ b/webapps/docs/windows-service-howto.xml @@ -18,14 +18,14 @@ This section of the documentation applies to procrun 1.0, and is now obsolete.

- Tomcat5 is a service application for running Tomcat5 as NT service. + Tomcat6 is a service application for running Tomcat6 as NT service.

- Tomcat5w is a GUI application for monitoring and configuring Tomcat + Tomcat6w is a GUI application for monitoring and configuring Tomcat services.

The available command line options are:

@@ -54,7 +54,7 @@ Run the service as console application 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 + exe sufix, meaning Tomcat6 //RS// Run the service @@ -289,18 +289,18 @@ The safest way to manually install the service is to use the provided service

-Install the service named 'Tomcat5' +Install the service named 'Tomcat6' C:\> service.bat install

-If using tomcat5.exe, you need to use the //IS// parameter. +If using tomcat6.exe, you need to use the //IS// parameter.

-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 @@ To update the service parameters, you need to use the //US// parameter.

-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
@@ -326,8 +326,8 @@ If the service is running it will be stopped and then deleted.

-Remove the service named 'Tomcat5' -C:\> tomcat5 //DS//Tomcat5 +Remove the service named 'Tomcat6' +C:\> tomcat6 //DS//Tomcat6

@@ -336,15 +336,15 @@ C:\> tomcat5 //DS//Tomcat5 To run the service in console mode, you need to use the //TS// parameter. The service shutdown can be initiated by pressing CTRL+C or CTRL+BREAK. -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.

-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

-- 2.11.0