You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2012/01/18 19:28:42 UTC
svn commit: r1232984 [2/3] - in /tomcat/site/trunk: docs/migration-6.html
docs/migration-7.html docs/migration.html xdocs/migration-6.xml
xdocs/migration-7.xml xdocs/migration.xml
Modified: tomcat/site/trunk/docs/migration.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1232984&r1=1232983&r2=1232984&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Wed Jan 18 18:28:41 2012
@@ -196,103 +196,15 @@
</li>
<li>
<a href="#Migrating_from_5.5.x_to_6.0.x">Migrating from 5.5.x to 6.0.x</a>
-<ol>
-<li>
-<a href="#Java_5_required">Java 5 required</a>
-</li>
-<li>
-<a href="#Modified_directory_structure">Modified directory structure</a>
-<ol>
-<li>
-<a href="#Shared_libraries">Shared libraries</a>
-</li>
-<li>
-<a href="#Endorsed_libraries">Endorsed libraries</a>
-</li>
-<li>
-<a href="#Default_web_applications">Default web applications</a>
-</li>
-</ol>
-</li>
-<li>
-<a href="#Modified_classloading">Modified classloading</a>
-</li>
-<li>
-<a href="#Internal_Logging_API_package_renaming">Internal Logging API package renaming</a>
-</li>
-<li>
-<a href="#commons-logging.jar">commons-logging.jar</a>
-</li>
-<li>
-<a href="#SSLEnabled_attribute_on_Connector">SSLEnabled attribute on Connector</a>
-</li>
-<li>
-<a href="#Connector_thread_pools">Connector thread pools</a>
-</li>
-<li>
-<a href="#Clustering_configuration_changes">Clustering configuration changes</a>
-</li>
-</ol>
</li>
<li>
-<a href="#Upgrading_6.0.x">Upgrading 6.0.x</a>
-<ol>
-<li>
-<a href="#Tomcat_6.0.x_configuration_file_differences">Tomcat 6.0.x configuration file differences</a>
-</li>
-</ol>
+<a href="#Upgrading_between_6.0.x_versions">Upgrading between 6.0.x versions</a>
</li>
<li>
<a href="#Migrating_from_6.0.x_to_7.0.x">Migrating from 6.0.x to 7.0.x</a>
-<ol>
-<li>
-<a href="#Java_6_required">Java 6 required</a>
-</li>
-<li>
-<a href="#General_configuration">General configuration</a>
-</li>
-<li>
-<a href="#Deployment">Deployment</a>
-</li>
-<li>
-<a href="#Manager_application">Manager application</a>
-</li>
-<li>
-<a href="#Host_Manager_application">Host Manager application</a>
-</li>
-<li>
-<a href="#Session_manager_configuration">Session manager configuration</a>
-</li>
-<li>
-<a href="#Session_cookie_configuration">Session cookie configuration</a>
-</li>
-<li>
-<a href="#Cookies">Cookies</a>
-</li>
-<li>
-<a href="#Request_attributes">Request attributes</a>
-</li>
-<li>
-<a href="#Comet">Comet</a>
-</li>
-<li>
-<a href="#XML_validation">XML validation</a>
-</li>
-<li>
-<a href="#System_properties">System properties</a>
-</li>
-<li>
-<a href="#Internal_APIs">Internal APIs</a>
-</li>
-</ol>
</li>
<li>
-<a href="#Upgrading_7.0.x">Upgrading 7.0.x</a>
-<ol>
-<li>
-<a href="#Tomcat_7.0.x_configuration_file_differences">Tomcat 7.0.x configuration file differences</a>
-</li>
-</ol>
+<a href="#Upgrading_between_7.0.x_versions">Upgrading between 7.0.x versions</a>
</li>
</ul>
@@ -356,262 +268,12 @@ accordingly.</p>
<p>
<blockquote>
-
-<p> This section lists all the known changes between 5.5.x and 6.0.x which may
- cause backwards compatibility problems when upgrading.</p>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Java 5 required">
-<!--()--></a><a name="Java_5_required"><strong>Java 5 required</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which
- could use a compatibility package to run on JRE 1.4.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Modified directory structure">
-<!--()--></a><a name="Modified_directory_structure"><strong>Modified directory structure</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Shared libraries">
-<!--()--></a><a name="Shared_libraries"><strong>Shared libraries</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Apache Tomcat 5.5.x used, by default, a directory structure including
- <code>common</code>, <code>shared</code> and <code>server</code> subdirectories.
- Apache Tomcat 6.0.x uses a single <code>lib</code> directory.</p>
-
-
-<p>The <code>lib</code> directory is the direct replacement for both
- <code>common/lib</code> and <code>common/classes</code> subdirectories:
- it accepts both JARs and exploded class hierarchies.</p>
-
-
-<p>The <code>conf/catalina.properties</code> file can be used to modify
- the directory structure.</p>
-
-
-<p>Starting with version 6.0.21, Apache Tomcat supports both the
- <code>$CATALINA_BASE/lib</code> and <code>$CATALINA_HOME/lib</code>
- directories. The jars and classes in <code>$CATALINA_BASE/lib</code>
- are earlier on the class path and thus take precedence.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Endorsed libraries">
-<!--()--></a><a name="Endorsed_libraries"><strong>Endorsed libraries</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The <code>$CATALINA_HOME/common/endorsed</code> subdirectory is replaced
- by the <code>$CATALINA_HOME/endorsed</code> directory. This directory is
- absent by default.</p>
-
-
-<p>The <code>JAVA_ENDORSED_DIRS</code> environment variable can be used
- with <code>setenv.bat</code>|<code>sh</code> scripts to provide alternative
- location of this directory.</p>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Default web applications">
-<!--()--></a><a name="Default_web_applications"><strong>Default web applications</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The Manager and Host Manager web applications are no longer in
- <code>server/webapps</code>. All of the default web applications
- are now located in the <code>webapps</code> directory.</p>
-
-
-<p>Note, that if <code>deployOnStartup</code> or <code>autoDeploy</code>
- options on the <strong>Host</strong> are enabled, the
- <code>META-INF/context.xml</code> files of manager and host-manager
- applications will be copied into the
- <code>$CATALINA_BASE/conf/[engine_name]/[host_name]</code>
- directory when Tomcat starts for the first time.</p>
-
-
-<p>When using a shared webhosting environment, it is recommended to forbid
- the use of context.xml inside the web applications (using the
- <code>deployXML</code> attribute of the <strong>Host</strong> element).
- (This option is also available in Tomcat 5.5).</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Modified classloading">
-<!--()--></a><a name="Modified_classloading"><strong>Modified classloading</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>As a result of the modification of the directory structure, the
- common, shared and server classloaders have been merged into one.
- Effectively, the shared and server classloaders are not configured by
- default and the common classloader is mapped to the <code>lib</code>
- directory, as described above.</p>
-
-<p>This behavior and structure can be modified using the
- <code>conf/catalina.properties</code> file.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Internal Logging API package renaming">
-<!--()--></a><a name="Internal_Logging_API_package_renaming"><strong>Internal Logging API package renaming</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Apache Tomcat 5.5.x relied on the
- <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
- library for its internal logging. Apache Tomcat 6.0.x and later no more
- uses the library directly, but uses a private copy of it. The classes are
- in the <code>org.apache.juli.logging</code> package.
- </p>
-
-
-<p>The rationale behind this change is that so that application logging
- can be as independent as possible from the container, while still having
- the possibility of being unified.</p>
-
-
-<p>By default only a subset of Apache Commons Logging classes that are
- needed to perform logging to <code>java.util.logging</code> is included
- with Tomcat. If you want to configure Tomcat to redirect its logging into
- <a href="http://logging.apache.org/log4j/">Log4J</a>, or any other logging
- framework supported by the full Apache Commons Logging library, you will
- have to replace one of Tomcat JARs with the full implementation. The JAR
- is available as an extras component. See the logging and extras
- documentation for more details.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="commons-logging.jar"><strong>commons-logging.jar</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
+<p>See <a href="migration-6.html">Migration Guide - Tomcat 6.0.x</a>.</p>
-
-<p>As Apache Tomcat no longer directly uses the
- <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
- library, the <code>commons-logging-api.jar</code> library is no longer
- provided for the web applications. The web applications that use
- Apache Commons Logging have to provide their own copy of that library.
- It is recommended to put it into their <code>WEB-INF/lib</code> directory,
- like any other JAR.</p>
-
</blockquote>
+</p>
</td>
</tr>
<tr>
@@ -620,54 +282,23 @@ accordingly.</p>
</td>
</tr>
</table>
-
-
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="SSLEnabled attribute on Connector">
-<!--()--></a><a name="SSLEnabled_attribute_on_Connector"><strong>SSLEnabled attribute on Connector</strong></a></font></td>
+<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Upgrading between 6.0.x versions">
+<!--()--></a><a name="Upgrading_between_6.0.x_versions"><strong>Upgrading between 6.0.x versions</strong></a></font></td>
</tr>
<tr>
<td>
+<p>
<blockquote>
-
-<p>For all SSL enabled connectors, the <code>SSLEnabled</code> flag must be set
- to <code>true</code> to enable encryption. Tomcat no longer relies on using
- the protocol and other parameters to determine if the transport should be
- encrypted, to give maximum flexibility in proxied scenarios.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
+<p>See <a href="migration-6.html#Upgrading_6.0.x">Migration Guide
+- Tomcat 6.0.x</a>.</p>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Connector thread pools">
-<!--()--></a><a name="Connector_thread_pools"><strong>Connector thread pools</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>The <strong>Connector</strong> thread pools have been simplified. They
- now grow to the maximum size specified but never shrink. The attributes
- associated with shrinking the thread pool (e.g. <code>minSpareThreads</code>)
- will be ignored. If you require a thread pool that grows and shrinks with
- demand you'll need to configure an <strong>Executor</strong> and then
- configure your <strong>Connector</strong> to use it.</p>
-
-
</blockquote>
+</p>
</td>
</tr>
<tr>
@@ -676,31 +307,18 @@ accordingly.</p>
</td>
</tr>
</table>
-
-
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Clustering configuration changes">
-<!--()--></a><a name="Clustering_configuration_changes"><strong>Clustering configuration changes</strong></a></font></td>
+<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Migrating from 6.0.x to 7.0.x">
+<!--()--></a><a name="Migrating_from_6.0.x_to_7.0.x"><strong>Migrating from 6.0.x to 7.0.x</strong></a></font></td>
</tr>
<tr>
<td>
+<p>
<blockquote>
-
-<p>Clustering configuration was refactored. See the clustering documentation
- for more details.</p>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
+<p>See <a href="migration-7.html">Migration Guide - Tomcat 7.0.x</a>.</p>
</blockquote>
@@ -715,936 +333,17 @@ accordingly.</p>
</table>
<table border="0" cellspacing="0" cellpadding="2" width="100%">
<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Upgrading 6.0.x">
-<!--()--></a><a name="Upgrading_6.0.x"><strong>Upgrading 6.0.x</strong></a></font></td>
+<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Upgrading between 7.0.x versions">
+<!--()--></a><a name="Upgrading_between_7.0.x_versions"><strong>Upgrading between 7.0.x versions</strong></a></font></td>
</tr>
<tr>
<td>
<p>
<blockquote>
-
-<p>When upgrading instances of Apache Tomcat from one version of Tomcat 6 to
- another, particularly when using separate locations for $CATALINA_HOME and
- $CATALINA_BASE, it is necessary to ensure that any changes in the
- configuration files such as new attributes and changes to defaults are applied
- as part of the upgrade. To assist with the identification of these changes,
- the form below may be used to view the differences between the configuration
- files in different versions of Tomcat 6.</p>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Tomcat 6.0.x configuration file differences">
-<!--()--></a><a name="Tomcat_6.0.x_configuration_file_differences"><strong>Tomcat 6.0.x configuration file differences</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>Select a configuration file, old version and new version from the boxes
- below and then click "View differences" to see the differences.
- The differences will be shown in a new tab/window.</p>
-
-
-<script type="text/javascript" language="JavaScript">
- function updateTc6ActionUrl() {
- var revisions = {
- "HEAD":"HEAD",
- "6.0.0":"466306",
- "6.0.1":"472328",
- "6.0.2":"475489",
- "6.0.4":"483285",
- "6.0.6":"487720",
- "6.0.7":"489812",
- "6.0.8":"496554",
- "6.0.9":"502060",
- "6.0.10":"506975",
- "6.0.13":"535436",
- "6.0.14":"557842",
- "6.0.16":"616101",
- "6.0.19":"751136",
- "6.0.20":"802250",
- "6.0.24":"900772",
- "6.0.26":"920929",
- "6.0.28":"958987",
- "6.0.29":"965461",
- "6.0.30":"1057276",
- "6.0.32":"1066582",
- "6.0.33":"1158221",
- "6.0.35":"1207053"
- };
- var formSubmit= document.getElementById('tc6Submit');
- var elementsSelect= document.getElementById('tc6Select').elements;
- formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/" +
- elementsSelect['filename'].value;
- formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value];
- formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value];
- return true;
- }
- </script>
-
-
-<form id="tc6Select" action="not-used">
-
-<p>Configuration file:
- <select name="filename">
- <option value="conf/catalina.policy">catalina.policy</option>
- <option value="conf/catalina.properties">catalina.properties</option>
- <option value="conf/context.xml">context.xml</option>
- <option value="conf/logging.properties">logging.properties</option>
- <option value="conf/server.xml">server.xml</option>
- <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
- <option value="conf/web.xml">web.xml</option>
- </select>
-
-</p>
-
-<p>Old version:
- <select name="r1">
- <option value="6.0.0">6.0.0</option>
- <option value="6.0.1">6.0.1</option>
- <option value="6.0.2">6.0.2</option>
- <option value="6.0.4">6.0.4</option>
- <option value="6.0.6">6.0.6</option>
- <option value="6.0.7">6.0.7</option>
- <option value="6.0.8">6.0.8</option>
- <option value="6.0.9">6.0.9</option>
- <option value="6.0.10">6.0.10</option>
- <option value="6.0.13">6.0.13</option>
- <option value="6.0.14">6.0.14</option>
- <option value="6.0.16">6.0.16</option>
- <option value="6.0.19">6.0.19</option>
- <option value="6.0.20">6.0.20</option>
- <option value="6.0.24">6.0.24</option>
- <option value="6.0.26">6.0.26</option>
- <option value="6.0.28">6.0.28</option>
- <option value="6.0.29">6.0.29</option>
- <option value="6.0.30">6.0.30</option>
- <option value="6.0.32">6.0.32</option>
- <option value="6.0.33" selected>6.0.33</option>
- <option value="6.0.35">6.0.35</option>
- </select>, new version:
- <select name="r2">
- <option value="6.0.0">6.0.0</option>
- <option value="6.0.1">6.0.1</option>
- <option value="6.0.2">6.0.2</option>
- <option value="6.0.4">6.0.4</option>
- <option value="6.0.6">6.0.6</option>
- <option value="6.0.7">6.0.7</option>
- <option value="6.0.8">6.0.8</option>
- <option value="6.0.9">6.0.9</option>
- <option value="6.0.10">6.0.10</option>
- <option value="6.0.13">6.0.13</option>
- <option value="6.0.14">6.0.14</option>
- <option value="6.0.16">6.0.16</option>
- <option value="6.0.19">6.0.19</option>
- <option value="6.0.20">6.0.20</option>
- <option value="6.0.24">6.0.24</option>
- <option value="6.0.26">6.0.26</option>
- <option value="6.0.28">6.0.28</option>
- <option value="6.0.29">6.0.29</option>
- <option value="6.0.30">6.0.30</option>
- <option value="6.0.32">6.0.32</option>
- <option value="6.0.33">6.0.33</option>
- <option value="6.0.35" selected>6.0.35</option>
- <option value="HEAD">trunk (unreleased)</option>
- </select>
-
-</p>
-
-</form>
-
-<form id="tc6Submit" action="to-be-replaced" method="get" target="_blank">
-
-<p>
-
-<input type="hidden" name="diff_format" value="h">
- <input type="hidden" name="r1"><input type="hidden" name="r2">
- <input type="submit" value="View Differences" onClick="return updateTc6ActionUrl();">
-
-</p>
-
-</form>
-
-<p>You can also use Subversion command similar to the following (all on one line):</p>
-
-<pre> svn diff
- --old=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_33/conf/
- --new=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_35/conf/
- </pre>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-</blockquote>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Migrating from 6.0.x to 7.0.x">
-<!--()--></a><a name="Migrating_from_6.0.x_to_7.0.x"><strong>Migrating from 6.0.x to 7.0.x</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<p>
-<blockquote>
-
-
-<p> This section lists all the known changes between 6.0.x and 7.0.x which may
- cause backwards compatibility problems when upgrading.</p>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Java 6 required">
-<!--()--></a><a name="Java_6_required"><strong>Java 6 required</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Apache Tomcat 7.0.x requires Java 6. Apache Tomcat 6.0.x required Java
- 5.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="General configuration">
-<!--()--></a><a name="General_configuration"><strong>General configuration</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>All configuration options that use regular expression now require a
- single regular expression (using <code>java.util.regex</code>) rather than a
- list of comma-separated or semi-colon-separated expressions.</p>
-
-
-<p>This concerns the following:</p>
-
-
-<ul>
-
-<li>
-<code>allow</code> and <code>deny</code> attributes in
- RemoteAddrFilter, RemoteHostFilter
- <a href="/tomcat-7.0-doc/config/filter.html">filters</a>
- and in RemoteAddrValve, RemoteHostValve
- <a href="/tomcat-7.0-doc/config/valve.html">valves</a>;
- </li>
-
-<li>
-<code>internalProxies</code>, <code>trustedProxies</code> attributes in
- <a href="/tomcat-7.0-doc/config/filter.html">RemoteIpFilter</a>,
- <a href="/tomcat-7.0-doc/config/valve.html">RemoteIpValve</a>;
- </li>
-
-<li>
-<code>filter</code> attribute in
- <a href="/tomcat-7.0-doc/config/cluster-valve.html">ReplicationValve</a>;</li>
-
-<li>
-<code>restrictedUserAgents</code>, <code>noCompressionUserAgents</code>
- attributes in
- <a href="/tomcat-7.0-doc/config/http.html">HTTP connectors</a>.</li>
-
-</ul>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Deployment"><strong>Deployment</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>XML context descriptors are no longer extracted from deployed WARs and
- directories and copied to the host's <code>xmlBase</code>. The default
- Tomcat 6 behavior can be enabled by setting the <code>copyXML</code>
- attribute of the <strong>Host</strong> element to <code>true</code>.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Manager application">
-<!--()--></a><a name="Manager_application"><strong>Manager application</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The Manager application has been re-structured for Tomcat 7 onwards and
- some URLs have changed. All URLs used to access the Manager application
- should now start with one of the following options:</p>
-
-
-<ul>
-
-<li><ContextPath>/html for the HTML GUI</li>
-
-<li><ContextPath>/text for the text interface</li>
-
-<li><ContextPath>/jmxproxy for the JMX proxy</li>
-
-<li><ContextPath>/status for the status pages</li>
-
-</ul>
-
-
-<p>Note that the URL for the text interface has changed from
- "<ContextPath>" to "<ContextPath>/text".</p>
-
-
-<p>The roles required to use the Manager application were changed from the
- single <tt>manager</tt> role to the following four roles. You will need to
- assign the role(s) required for the functionality you wish to access.</p>
-
-
-<ul>
-
-<li>
-<tt>manager-gui</tt> - allows access to the HTML GUI and the status
- pages</li>
-
-<li>
-<tt>manager-script</tt> - allows access to the text interface and the
- status pages</li>
-
-<li>
-<tt>manager-jmx</tt> - allows access to the JMX proxy and the status
- pages</li>
-
-<li>
-<tt>manager-status</tt> - allows access to the status pages only</li>
-
-</ul>
-
-
-<p>The HTML interface is protected against CSRF but the text and JMX
- interfaces are not. To maintain the CSRF protection:</p>
-
-
-<ul>
-
-<li>users with the <tt>manager-gui</tt> role should not be granted
- either the <tt>manager-script</tt> or <tt>manager-jmx</tt> roles.</li>
-
-<li>if the text or jmx interfaces are accessed through a browser (e.g. for
- testing since these interfaces are intended for tools not humans) then
- the browser must be closed afterwards to terminate the session.</li>
-
-</ul>
-
-
-<p>The roles command has been removed from the Manager application since it
- did not work with the default configuration and most Realms do not support
- providing a list of roles.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Host Manager application">
-<!--()--></a><a name="Host_Manager_application"><strong>Host Manager application</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The Host Manager application has been re-structured for Tomcat 7 onwards
- and some URLs have changed. All URLs used to access the Host Manager
- application should now start with one of the following options:</p>
-
-
-<ul>
-
-<li><ContextPath>/html for the HTML GUI</li>
-
-<li><ContextPath>/text for the text interface</li>
-
-</ul>
-
-
-<p>Note that the URL for the text interface has changed from
- "<ContextPath>" to "<ContextPath>/text".</p>
-
-
-<p>The roles required to use the Host Manager application were changed from
- the single <tt>admin</tt> role to the following two roles. You will need to
- assign the role(s) required for the functionality you wish to access.</p>
-
-
-<ul>
-
-<li>
-<tt>admin-gui</tt> - allows access to the HTML GUI and the status
- pages</li>
-
-<li>
-<tt>admin-script</tt> - allows access to the text interface and the
- status pages</li>
-
-</ul>
-
-
-<p>The HTML interface is protected against CSRF but the text interface is
- not. To maintain the CSRF protection:</p>
-
-
-<ul>
-
-<li>users with the <tt>admin-gui</tt> role should not be granted the
- <tt>admin-script</tt> role.</li>
-
-<li>if the text interface is accessed through a browser (e.g. for testing
- since this inteface is intended for tools not humans) then the browser
- must be closed afterwards to terminate the session.</li>
-
-</ul>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Session manager configuration">
-<!--()--></a><a name="Session_manager_configuration"><strong>Session manager configuration</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-<p>A number of changes have been made to the session manager to improve the
- performance of session generation and destruction including changes to
- session ID generation. The session ID generation changes take advantages of
- improvements in <code>java.secure.SecureRandom</code> since the session ID
- generation was first written. The configuration changes are:</p>
-
-
-<ul>
-
-<li>
-<tt>randomClass</tt> has changed to <tt>secureRandomClass</tt> and
- the provided class must extend <code>java.secure.SecureRandom</code>
-</li>
-
-<li>Two new properties <tt>secureRandomAlgoithm</tt> and
- <tt>secureRandomProvider</tt> have been added to enable the selection of
- a SecureRandom implementation.</li>
-
-<li>The <tt>algorithm</tt> attribute has been removed</li>
-
-<li>The <tt>entropy</tt> attribute has been removed</li>
-
-</ul>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Session cookie configuration">
-<!--()--></a><a name="Session_cookie_configuration"><strong>Session cookie configuration</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>With the addition of <code>SessionCookieConfig</code> in the Servlet 3.0
- specification, a number of session cookie configuration options have been
- removed to reduce configuration and code complexity.</p>
-
-
-<ul>
-
-<li>
-<strong>Connector</strong><code>.emptySessionPath</code>: This has been removed. An equivalent
- effect can be obtained by configuring sessionCookiePath="/" in the global
- context.xml (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
-
-
-<li>
-<code>org.apache.catalina.SESSION_COOKIE_NAME</code> system property: This has been
- removed. An equivalent effect can be obtained by configuring the
- <code>sessionCookieName</code> attribute for the global context.xml
- (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
-
-
-<li>
-<code>org.apache.catalina.SESSION_PARAMETER_NAME</code> system property: This has
- been removed. An equivalent effect can be obtained by configuring the
- <code>sessionCookieName</code> attribute for the global context.xml
- (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
-
-
-<li>
-<strong>Context</strong><code>.disableURLRewriting</code>: This has
- been removed. An equivalent effect can be obtained by configuring the
- <code>session-config/tracking-mode</code> elements in a web application
- or in the global <conf>CATALINA_BASE/conf/web.xml</conf> file.</li>
-
-</ul>
-
-
-<p>The session and SSO cookies in Tomcat 7 are being sent with HttpOnly
- flag by default, to instruct browsers to prevent access to those cookies
- from JavaScript.
- (This can be enabled in Tomcat 6.0 and 5.5 by setting
- <code>useHttpOnly="true"</code> on <strong>Context</strong> element in
- a web application or in the global
- <code>CATALINA_BASE/conf/context.xml</code> file).</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Cookies"><strong>Cookies</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Tomcat no longer accepts non-specification compliant name only cookies by
- default. However, a new system property has been added,
- <code>org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY</code>, that
- can be used to accept name only cookies.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Request attributes">
-<!--()--></a><a name="Request_attributes"><strong>Request attributes</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The custom request attribute
- <code>javax.servlet.request.ssl_session</code> provided to access the SSL
- session ID has been deprecated in favour of the new, specification defined
- request attribute <code>javax.servlet.request.ssl_session_id</code>. Support
- for the custom attribute will be removed in Tomcat 8.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Comet"><strong>Comet</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>To enable Comet to work correctly when running under a security manager,
- the Comet classes have been moved from the <code>org.apache.catalina</code>
- package to the <code>org.apache.catalina.comet</code> package. Code using
- Comet will need to be updated and recompiled to reflect the new package
- name.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="XML validation">
-<!--()--></a><a name="XML_validation"><strong>XML validation</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The configuration of XML validation has been simplified. The
- <code>xmlValidation</code> and <code>xmlNamespaceAware</code> attributes
- have been removed from the <code><Host></code> element. These
- attributes, along with <code>tldValidation</code> and
- <code>tldNamespaceAware</code>, are now set per <code><Context></code>
- element. The defaults (<code>false</code> for each attribute) have not been
- changed. However, in line with the requirements of the Servlet
- specification, if the
- <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system
- property is set to <code>true</code>, XML validation and namespace
- awareness will be enabled by default.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="System properties">
-<!--()--></a><a name="System_properties"><strong>System properties</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>The <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system
- property has been modified to provide greater control over its effects. Each
- behavioural change is now controlled by a dedicated system property. The
- default behaviour is unchanged. The
- <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system property
- now controls whether or not specification compliant defaults are used for
- the other system properties. Even if
- <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> is
- <code>true</code>, setting the individual system properties will always take
- priority.</p>
-
-
-<p>The <code>org.apache.coyote.MAX_TRAILER_SIZE</code> has been removed and
- is replaced by the maxTrailerSize attribute of the Connector.</p>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Internal APIs">
-<!--()--></a><a name="Internal_APIs"><strong>Internal APIs</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Whilst the Tomcat 7 internal API is broadly compatible with Tomcat 6
- there have been many changes at the detail level and they are not binary
- compatible. Developers of custom components that interact with Tomcat's
- internals should review the JavaDoc for the relevant API. Of particular note
- are:</p>
-
-<ul>
-
-<li>Use of generics.</li>
-
-<li>A standard implementation of the Lifecycle interface that all
- components extend.</li>
-
-<li>The use of Context name rather than Context path as the unique
- identifier for a Context within a Host.</li>
-
-</ul>
-
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-
-
-</blockquote>
-</p>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#525D76"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Upgrading 7.0.x">
-<!--()--></a><a name="Upgrading_7.0.x"><strong>Upgrading 7.0.x</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<p>
-<blockquote>
-
-<p>When upgrading instances of Apache Tomcat from one version of Tomcat 7 to
- another, particularly when using separate locations for $CATALINA_HOME and
- $CATALINA_BASE, it is necessary to ensure that any changes in the
- configuration files such as new attributes and changes to defaults are applied
- as part of the upgrade. To assist with the identification of these changes,
- the form below may be used to view the differences between the configuration
- files in different versions of Tomcat 7.</p>
-
-
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#828DA6"><font color="#ffffff" face="arial,helvetica,sanserif"><a name="Tomcat 7.0.x configuration file differences">
-<!--()--></a><a name="Tomcat_7.0.x_configuration_file_differences"><strong>Tomcat 7.0.x configuration file differences</strong></a></font></td>
-</tr>
-<tr>
-<td>
-<blockquote>
-
-
-<p>Select a configuration file, old version and new version from the boxes
- below and then click "View differences" to see the differences.
- The differences will be shown in a new tab/window.</p>
-
-
-<script type="text/javascript" language="JavaScript">
- function updateTc7ActionUrl() {
- var revisions = {
- "HEAD":"HEAD",
- "7.0.0":"954232",
- "7.0.2":"982035",
- "7.0.4":"1022637",
- "7.0.5":"1038717",
- "7.0.6":"1057288",
- "7.0.8":"1067169",
- "7.0.10":"1078282",
- "7.0.11":"1080182",
- "7.0.12":"1087797",
- "7.0.14":"1101230",
- "7.0.16":"1134562",
- "7.0.19":"1146504",
- "7.0.20":"1155255",
- "7.0.21":"1162976",
- "7.0.22":"1176599",
- "7.0.23":"1203305"
- };
- var formSubmit= document.getElementById('tc7Submit');
- var elementsSelect= document.getElementById('tc7Select').elements;
- formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/" +
- elementsSelect['filename'].value;
- formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value];
- formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value];
- return true;
- }
- </script>
-
-
-<form id="tc7Select" action="not-used">
-
-<p>Configuration file:
- <select name="filename">
- <option value="conf/catalina.policy">catalina.policy</option>
- <option value="conf/catalina.properties">catalina.properties</option>
- <option value="conf/context.xml">context.xml</option>
- <option value="conf/logging.properties">logging.properties</option>
- <option value="conf/server.xml">server.xml</option>
- <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
- <option value="conf/web.xml">web.xml</option>
- </select>
-
-</p>
-
-<p>Old version:
- <select name="r1">
- <option value="7.0.0">7.0.0</option>
- <option value="7.0.2">7.0.2</option>
- <option value="7.0.4">7.0.4</option>
- <option value="7.0.5">7.0.5</option>
- <option value="7.0.6">7.0.6</option>
- <option value="7.0.8">7.0.8</option>
- <option value="7.0.10">7.0.10</option>
- <option value="7.0.11">7.0.11</option>
- <option value="7.0.12">7.0.12</option>
- <option value="7.0.14">7.0.14</option>
- <option value="7.0.16">7.0.16</option>
- <option value="7.0.19">7.0.19</option>
- <option value="7.0.20">7.0.20</option>
- <option value="7.0.21">7.0.21</option>
- <option value="7.0.22" selected>7.0.22</option>
- <option value="7.0.23">7.0.23</option>
- </select>, new version:
- <select name="r2">
- <option value="7.0.0">7.0.0</option>
- <option value="7.0.2">7.0.2</option>
- <option value="7.0.4">7.0.4</option>
- <option value="7.0.5">7.0.5</option>
- <option value="7.0.6">7.0.6</option>
- <option value="7.0.8">7.0.8</option>
- <option value="7.0.10">7.0.10</option>
- <option value="7.0.11">7.0.11</option>
- <option value="7.0.12">7.0.12</option>
- <option value="7.0.14">7.0.14</option>
- <option value="7.0.16">7.0.16</option>
- <option value="7.0.19">7.0.19</option>
- <option value="7.0.20">7.0.20</option>
- <option value="7.0.21">7.0.21</option>
- <option value="7.0.22">7.0.22</option>
- <option value="7.0.23" selected>7.0.23</option>
- <option value="HEAD">trunk (unreleased)</option>
- </select>
-
-</p>
-
-</form>
-
-<form id="tc7Submit" action="to-be-replaced" method="get" target="_blank">
-
-<p>
-
-<input type="hidden" name="diff_format" value="h">
- <input type="hidden" name="r1"><input type="hidden" name="r2">
- <input type="submit" value="View Differences" onClick="return updateTc7ActionUrl();">
-
-</p>
-
-</form>
-
-<p>You can also use Subversion command similar to the following (all on one line):</p>
-
-<pre> svn diff
- --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_22/conf/
- --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_23/conf/
- </pre>
-
-</blockquote>
-</td>
-</tr>
-<tr>
-<td>
-<br>
-</td>
-</tr>
-</table>
+<p>See <a href="migration-7.html#Upgrading_7.0.x">Migration Guide
+- Tomcat 7.0.x</a>.</p>
</blockquote>
Added: tomcat/site/trunk/xdocs/migration-6.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-6.xml?rev=1232984&view=auto
==============================================================================
--- tomcat/site/trunk/xdocs/migration-6.xml (added)
+++ tomcat/site/trunk/xdocs/migration-6.xml Wed Jan 18 18:28:41 2012
@@ -0,0 +1,303 @@
+<?xml version="1.0"?>
+<document>
+
+ <properties>
+ <author>Apache Tomcat Project</author>
+ <title>Migration Guide - Tomcat 6.0.x</title>
+ </properties>
+
+<body>
+
+<section name="Table of Contents">
+<toc/>
+</section>
+
+<section name="General">
+
+<p>Please read general <a href="migration.html">Migration Guide page</a> first,
+for common considerations that apply to migration or upgrade between versions
+of Apache Tomcat.</p>
+
+</section>
+
+<section name="Migrating from 5.5.x to 6.0.x">
+
+ <p> This section lists all the known changes between 5.5.x and 6.0.x which may
+ cause backwards compatibility problems when upgrading.</p>
+
+ <subsection name="Java 5 required">
+
+ <p>Apache Tomcat 6.0.x requires Java 5 or later, unlike Apache Tomcat 5.5.x which
+ could use a compatibility package to run on JRE 1.4.</p>
+
+ </subsection>
+
+ <subsection name="Modified directory structure">
+
+ <subsection name="Shared libraries">
+
+ <p>Apache Tomcat 5.5.x used, by default, a directory structure including
+ <code>common</code>, <code>shared</code> and <code>server</code> subdirectories.
+ Apache Tomcat 6.0.x uses a single <code>lib</code> directory.</p>
+
+ <p>The <code>lib</code> directory is the direct replacement for both
+ <code>common/lib</code> and <code>common/classes</code> subdirectories:
+ it accepts both JARs and exploded class hierarchies.</p>
+
+ <p>The <code>conf/catalina.properties</code> file can be used to modify
+ the directory structure.</p>
+
+ <p>Starting with version 6.0.21, Apache Tomcat supports both the
+ <code>$CATALINA_BASE/lib</code> and <code>$CATALINA_HOME/lib</code>
+ directories. The jars and classes in <code>$CATALINA_BASE/lib</code>
+ are earlier on the class path and thus take precedence.</p>
+
+ </subsection>
+
+ <subsection name="Endorsed libraries">
+
+ <p>The <code>$CATALINA_HOME/common/endorsed</code> subdirectory is replaced
+ by the <code>$CATALINA_HOME/endorsed</code> directory. This directory is
+ absent by default.</p>
+
+ <p>The <code>JAVA_ENDORSED_DIRS</code> environment variable can be used
+ with <code>setenv.bat</code>|<code>sh</code> scripts to provide alternative
+ location of this directory.</p>
+ </subsection>
+
+ <subsection name="Default web applications">
+
+ <p>The Manager and Host Manager web applications are no longer in
+ <code>server/webapps</code>. All of the default web applications
+ are now located in the <code>webapps</code> directory.</p>
+
+ <p>Note, that if <code>deployOnStartup</code> or <code>autoDeploy</code>
+ options on the <strong>Host</strong> are enabled, the
+ <code>META-INF/context.xml</code> files of manager and host-manager
+ applications will be copied into the
+ <code>$CATALINA_BASE/conf/[engine_name]/[host_name]</code>
+ directory when Tomcat starts for the first time.</p>
+
+ <p>When using a shared webhosting environment, it is recommended to forbid
+ the use of context.xml inside the web applications (using the
+ <code>deployXML</code> attribute of the <strong>Host</strong> element).
+ (This option is also available in Tomcat 5.5).</p>
+
+ </subsection>
+
+ </subsection>
+
+ <subsection name="Modified classloading">
+
+ <p>As a result of the modification of the directory structure, the
+ common, shared and server classloaders have been merged into one.
+ Effectively, the shared and server classloaders are not configured by
+ default and the common classloader is mapped to the <code>lib</code>
+ directory, as described above.</p>
+ <p>This behavior and structure can be modified using the
+ <code>conf/catalina.properties</code> file.</p>
+
+ </subsection>
+
+ <subsection name="Internal Logging API package renaming">
+
+ <p>Apache Tomcat 5.5.x relied on the
+ <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
+ library for its internal logging. Apache Tomcat 6.0.x and later no more
+ uses the library directly, but uses a private copy of it. The classes are
+ in the <code>org.apache.juli.logging</code> package.
+ </p>
+
+ <p>The rationale behind this change is that so that application logging
+ can be as independent as possible from the container, while still having
+ the possibility of being unified.</p>
+
+ <p>By default only a subset of Apache Commons Logging classes that are
+ needed to perform logging to <code>java.util.logging</code> is included
+ with Tomcat. If you want to configure Tomcat to redirect its logging into
+ <a href="http://logging.apache.org/log4j/">Log4J</a>, or any other logging
+ framework supported by the full Apache Commons Logging library, you will
+ have to replace one of Tomcat JARs with the full implementation. The JAR
+ is available as an extras component. See the logging and extras
+ documentation for more details.</p>
+
+ </subsection>
+
+ <subsection name="commons-logging.jar">
+
+ <p>As Apache Tomcat no longer directly uses the
+ <a href="http://commons.apache.org/logging/">Apache Commons Logging</a>
+ library, the <code>commons-logging-api.jar</code> library is no longer
+ provided for the web applications. The web applications that use
+ Apache Commons Logging have to provide their own copy of that library.
+ It is recommended to put it into their <code>WEB-INF/lib</code> directory,
+ like any other JAR.</p>
+
+ </subsection>
+
+ <subsection name="SSLEnabled attribute on Connector">
+
+ <p>For all SSL enabled connectors, the <code>SSLEnabled</code> flag must be set
+ to <code>true</code> to enable encryption. Tomcat no longer relies on using
+ the protocol and other parameters to determine if the transport should be
+ encrypted, to give maximum flexibility in proxied scenarios.</p>
+
+ </subsection>
+
+ <subsection name="Connector thread pools">
+
+ <p>The <strong>Connector</strong> thread pools have been simplified. They
+ now grow to the maximum size specified but never shrink. The attributes
+ associated with shrinking the thread pool (e.g. <code>minSpareThreads</code>)
+ will be ignored. If you require a thread pool that grows and shrinks with
+ demand you'll need to configure an <strong>Executor</strong> and then
+ configure your <strong>Connector</strong> to use it.</p>
+
+ </subsection>
+
+ <subsection name="Clustering configuration changes">
+
+ <p>Clustering configuration was refactored. See the clustering documentation
+ for more details.</p>
+
+ </subsection>
+
+</section>
+
+<section name="Upgrading 6.0.x">
+
+ <p>When upgrading instances of Apache Tomcat from one version of Tomcat 6 to
+ another, particularly when using separate locations for $CATALINA_HOME and
+ $CATALINA_BASE, it is necessary to ensure that any changes in the
+ configuration files such as new attributes and changes to defaults are applied
+ as part of the upgrade. To assist with the identification of these changes,
+ the form below may be used to view the differences between the configuration
+ files in different versions of Tomcat 6.</p>
+
+ <subsection name="Tomcat 6.0.x configuration file differences">
+
+ <p>Select a configuration file, old version and new version from the boxes
+ below and then click "View differences" to see the differences.
+ The differences will be shown in a new tab/window.</p>
+
+ <script type="text/javascript" language="JavaScript">
+ function updateTc6ActionUrl() {
+ var revisions = {
+ "HEAD":"HEAD",
+ "6.0.0":"466306",
+ "6.0.1":"472328",
+ "6.0.2":"475489",
+ "6.0.4":"483285",
+ "6.0.6":"487720",
+ "6.0.7":"489812",
+ "6.0.8":"496554",
+ "6.0.9":"502060",
+ "6.0.10":"506975",
+ "6.0.13":"535436",
+ "6.0.14":"557842",
+ "6.0.16":"616101",
+ "6.0.19":"751136",
+ "6.0.20":"802250",
+ "6.0.24":"900772",
+ "6.0.26":"920929",
+ "6.0.28":"958987",
+ "6.0.29":"965461",
+ "6.0.30":"1057276",
+ "6.0.32":"1066582",
+ "6.0.33":"1158221",
+ "6.0.35":"1207053"
+ };
+ var formSubmit= document.getElementById('tc6Submit');
+ var elementsSelect= document.getElementById('tc6Select').elements;
+ formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/" +
+ elementsSelect['filename'].value;
+ formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value];
+ formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value];
+ return true;
+ }
+ </script>
+
+ <form id="tc6Select" action="not-used">
+ <p>Configuration file:
+ <select name="filename">
+ <option value="conf/catalina.policy">catalina.policy</option>
+ <option value="conf/catalina.properties">catalina.properties</option>
+ <option value="conf/context.xml">context.xml</option>
+ <option value="conf/logging.properties">logging.properties</option>
+ <option value="conf/server.xml">server.xml</option>
+ <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
+ <option value="conf/web.xml">web.xml</option>
+ </select>
+ </p>
+ <p>Old version:
+ <select name="r1">
+ <option value="6.0.0">6.0.0</option>
+ <option value="6.0.1">6.0.1</option>
+ <option value="6.0.2">6.0.2</option>
+ <option value="6.0.4">6.0.4</option>
+ <option value="6.0.6">6.0.6</option>
+ <option value="6.0.7">6.0.7</option>
+ <option value="6.0.8">6.0.8</option>
+ <option value="6.0.9">6.0.9</option>
+ <option value="6.0.10">6.0.10</option>
+ <option value="6.0.13">6.0.13</option>
+ <option value="6.0.14">6.0.14</option>
+ <option value="6.0.16">6.0.16</option>
+ <option value="6.0.19">6.0.19</option>
+ <option value="6.0.20">6.0.20</option>
+ <option value="6.0.24">6.0.24</option>
+ <option value="6.0.26">6.0.26</option>
+ <option value="6.0.28">6.0.28</option>
+ <option value="6.0.29">6.0.29</option>
+ <option value="6.0.30">6.0.30</option>
+ <option value="6.0.32">6.0.32</option>
+ <option value="6.0.33" selected="selected">6.0.33</option>
+ <option value="6.0.35">6.0.35</option>
+ </select>, new version:
+ <select name="r2">
+ <option value="6.0.0">6.0.0</option>
+ <option value="6.0.1">6.0.1</option>
+ <option value="6.0.2">6.0.2</option>
+ <option value="6.0.4">6.0.4</option>
+ <option value="6.0.6">6.0.6</option>
+ <option value="6.0.7">6.0.7</option>
+ <option value="6.0.8">6.0.8</option>
+ <option value="6.0.9">6.0.9</option>
+ <option value="6.0.10">6.0.10</option>
+ <option value="6.0.13">6.0.13</option>
+ <option value="6.0.14">6.0.14</option>
+ <option value="6.0.16">6.0.16</option>
+ <option value="6.0.19">6.0.19</option>
+ <option value="6.0.20">6.0.20</option>
+ <option value="6.0.24">6.0.24</option>
+ <option value="6.0.26">6.0.26</option>
+ <option value="6.0.28">6.0.28</option>
+ <option value="6.0.29">6.0.29</option>
+ <option value="6.0.30">6.0.30</option>
+ <option value="6.0.32">6.0.32</option>
+ <option value="6.0.33">6.0.33</option>
+ <option value="6.0.35" selected="selected">6.0.35</option>
+ <option value="HEAD">trunk (unreleased)</option>
+ </select>
+ </p>
+ </form>
+ <form id="tc6Submit" action="to-be-replaced" method="get"
+ target="_blank">
+ <p>
+ <input type="hidden" name="diff_format" value="h"/>
+ <input type="hidden" name="r1"/><input type="hidden" name="r2"/>
+ <input type="submit" value="View Differences"
+ onClick="return updateTc6ActionUrl();"/>
+ </p>
+ </form>
+ <p>You can also use Subversion command similar to the following (all on one line):</p>
+ <pre> svn diff
+ --old=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_33/conf/
+ --new=http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_35/conf/
+ </pre>
+ </subsection>
+
+</section>
+
+</body>
+</document>
Propchange: tomcat/site/trunk/xdocs/migration-6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/site/trunk/xdocs/migration-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1232984&view=auto
==============================================================================
--- tomcat/site/trunk/xdocs/migration-7.xml (added)
+++ tomcat/site/trunk/xdocs/migration-7.xml Wed Jan 18 18:28:41 2012
@@ -0,0 +1,411 @@
+<?xml version="1.0"?>
+<document>
+
+ <properties>
+ <author>Apache Tomcat Project</author>
+ <title>Migration Guide - Tomcat 7.0.x</title>
+ </properties>
+
+<body>
+
+<section name="Table of Contents">
+<toc/>
+</section>
+
+<section name="General">
+
+<p>Please read general <a href="migration.html">Migration Guide page</a> first,
+for common considerations that apply to migration or upgrade between versions
+of Apache Tomcat.</p>
+
+</section>
+
+<section name="Migrating from 6.0.x to 7.0.x">
+
+ <p> This section lists all the known changes between 6.0.x and 7.0.x which may
+ cause backwards compatibility problems when upgrading.</p>
+
+ <subsection name="Java 6 required">
+
+ <p>Apache Tomcat 7.0.x requires Java 6. Apache Tomcat 6.0.x required Java
+ 5.</p>
+
+ </subsection>
+
+ <subsection name="General configuration">
+
+ <p>All configuration options that use regular expression now require a
+ single regular expression (using <code>java.util.regex</code>) rather than a
+ list of comma-separated or semi-colon-separated expressions.</p>
+
+ <p>This concerns the following:</p>
+
+ <ul>
+ <li><code>allow</code> and <code>deny</code> attributes in
+ RemoteAddrFilter, RemoteHostFilter
+ <a href="/tomcat-7.0-doc/config/filter.html">filters</a>
+ and in RemoteAddrValve, RemoteHostValve
+ <a href="/tomcat-7.0-doc/config/valve.html">valves</a>;
+ </li>
+ <li><code>internalProxies</code>, <code>trustedProxies</code> attributes in
+ <a href="/tomcat-7.0-doc/config/filter.html">RemoteIpFilter</a>,
+ <a href="/tomcat-7.0-doc/config/valve.html">RemoteIpValve</a>;
+ </li>
+ <li><code>filter</code> attribute in
+ <a href="/tomcat-7.0-doc/config/cluster-valve.html">ReplicationValve</a>;</li>
+ <li><code>restrictedUserAgents</code>, <code>noCompressionUserAgents</code>
+ attributes in
+ <a href="/tomcat-7.0-doc/config/http.html">HTTP connectors</a>.</li>
+ </ul>
+
+ </subsection>
+
+ <subsection name="Deployment">
+
+ <p>XML context descriptors are no longer extracted from deployed WARs and
+ directories and copied to the host's <code>xmlBase</code>. The default
+ Tomcat 6 behavior can be enabled by setting the <code>copyXML</code>
+ attribute of the <strong>Host</strong> element to <code>true</code>.</p>
+
+ </subsection>
+
+ <subsection name="Manager application">
+
+ <p>The Manager application has been re-structured for Tomcat 7 onwards and
+ some URLs have changed. All URLs used to access the Manager application
+ should now start with one of the following options:</p>
+
+ <ul>
+ <li><ContextPath>/html for the HTML GUI</li>
+ <li><ContextPath>/text for the text interface</li>
+ <li><ContextPath>/jmxproxy for the JMX proxy</li>
+ <li><ContextPath>/status for the status pages</li>
+ </ul>
+
+ <p>Note that the URL for the text interface has changed from
+ "<ContextPath>" to "<ContextPath>/text".</p>
+
+ <p>The roles required to use the Manager application were changed from the
+ single <tt>manager</tt> role to the following four roles. You will need to
+ assign the role(s) required for the functionality you wish to access.</p>
+
+ <ul>
+ <li><tt>manager-gui</tt> - allows access to the HTML GUI and the status
+ pages</li>
+ <li><tt>manager-script</tt> - allows access to the text interface and the
+ status pages</li>
+ <li><tt>manager-jmx</tt> - allows access to the JMX proxy and the status
+ pages</li>
+ <li><tt>manager-status</tt> - allows access to the status pages only</li>
+ </ul>
+
+ <p>The HTML interface is protected against CSRF but the text and JMX
+ interfaces are not. To maintain the CSRF protection:</p>
+
+ <ul>
+ <li>users with the <tt>manager-gui</tt> role should not be granted
+ either the <tt>manager-script</tt> or <tt>manager-jmx</tt> roles.</li>
+ <li>if the text or jmx interfaces are accessed through a browser (e.g. for
+ testing since these interfaces are intended for tools not humans) then
+ the browser must be closed afterwards to terminate the session.</li>
+ </ul>
+
+ <p>The roles command has been removed from the Manager application since it
+ did not work with the default configuration and most Realms do not support
+ providing a list of roles.</p>
+
+ </subsection>
+
+ <subsection name="Host Manager application">
+
+ <p>The Host Manager application has been re-structured for Tomcat 7 onwards
+ and some URLs have changed. All URLs used to access the Host Manager
+ application should now start with one of the following options:</p>
+
+ <ul>
+ <li><ContextPath>/html for the HTML GUI</li>
+ <li><ContextPath>/text for the text interface</li>
+ </ul>
+
+ <p>Note that the URL for the text interface has changed from
+ "<ContextPath>" to "<ContextPath>/text".</p>
+
+ <p>The roles required to use the Host Manager application were changed from
+ the single <tt>admin</tt> role to the following two roles. You will need to
+ assign the role(s) required for the functionality you wish to access.</p>
+
+ <ul>
+ <li><tt>admin-gui</tt> - allows access to the HTML GUI and the status
+ pages</li>
+ <li><tt>admin-script</tt> - allows access to the text interface and the
+ status pages</li>
+ </ul>
+
+ <p>The HTML interface is protected against CSRF but the text interface is
+ not. To maintain the CSRF protection:</p>
+
+ <ul>
+ <li>users with the <tt>admin-gui</tt> role should not be granted the
+ <tt>admin-script</tt> role.</li>
+ <li>if the text interface is accessed through a browser (e.g. for testing
+ since this inteface is intended for tools not humans) then the browser
+ must be closed afterwards to terminate the session.</li>
+ </ul>
+
+ </subsection>
+
+ <subsection name="Session manager configuration">
+ <p>A number of changes have been made to the session manager to improve the
+ performance of session generation and destruction including changes to
+ session ID generation. The session ID generation changes take advantages of
+ improvements in <code>java.secure.SecureRandom</code> since the session ID
+ generation was first written. The configuration changes are:</p>
+
+ <ul>
+ <li><tt>randomClass</tt> has changed to <tt>secureRandomClass</tt> and
+ the provided class must extend <code>java.secure.SecureRandom</code></li>
+ <li>Two new properties <tt>secureRandomAlgoithm</tt> and
+ <tt>secureRandomProvider</tt> have been added to enable the selection of
+ a SecureRandom implementation.</li>
+ <li>The <tt>algorithm</tt> attribute has been removed</li>
+ <li>The <tt>entropy</tt> attribute has been removed</li>
+ </ul>
+ </subsection>
+
+ <subsection name="Session cookie configuration">
+
+ <p>With the addition of <code>SessionCookieConfig</code> in the Servlet 3.0
+ specification, a number of session cookie configuration options have been
+ removed to reduce configuration and code complexity.</p>
+
+ <ul>
+ <li><strong>Connector</strong><code>.emptySessionPath</code>: This has been removed. An equivalent
+ effect can be obtained by configuring sessionCookiePath="/" in the global
+ context.xml (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
+
+ <li><code>org.apache.catalina.SESSION_COOKIE_NAME</code> system property: This has been
+ removed. An equivalent effect can be obtained by configuring the
+ <code>sessionCookieName</code> attribute for the global context.xml
+ (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
+
+ <li><code>org.apache.catalina.SESSION_PARAMETER_NAME</code> system property: This has
+ been removed. An equivalent effect can be obtained by configuring the
+ <code>sessionCookieName</code> attribute for the global context.xml
+ (in <code>CATALINA_BASE/conf/context.xml</code>).</li>
+
+ <li><strong>Context</strong><code>.disableURLRewriting</code>: This has
+ been removed. An equivalent effect can be obtained by configuring the
+ <code>session-config/tracking-mode</code> elements in a web application
+ or in the global <conf>CATALINA_BASE/conf/web.xml</conf> file.</li>
+ </ul>
+
+ <p>The session and SSO cookies in Tomcat 7 are being sent with HttpOnly
+ flag by default, to instruct browsers to prevent access to those cookies
+ from JavaScript.
+ (This can be enabled in Tomcat 6.0 and 5.5 by setting
+ <code>useHttpOnly="true"</code> on <strong>Context</strong> element in
+ a web application or in the global
+ <code>CATALINA_BASE/conf/context.xml</code> file).</p>
+
+ </subsection>
+
+ <subsection name="Cookies">
+
+ <p>Tomcat no longer accepts non-specification compliant name only cookies by
+ default. However, a new system property has been added,
+ <code>org.apache.tomcat.util.http.ServerCookie.ALLOW_NAME_ONLY</code>, that
+ can be used to accept name only cookies.</p>
+
+ </subsection>
+
+ <subsection name="Request attributes">
+
+ <p>The custom request attribute
+ <code>javax.servlet.request.ssl_session</code> provided to access the SSL
+ session ID has been deprecated in favour of the new, specification defined
+ request attribute <code>javax.servlet.request.ssl_session_id</code>. Support
+ for the custom attribute will be removed in Tomcat 8.</p>
+
+ </subsection>
+
+ <subsection name="Comet">
+
+ <p>To enable Comet to work correctly when running under a security manager,
+ the Comet classes have been moved from the <code>org.apache.catalina</code>
+ package to the <code>org.apache.catalina.comet</code> package. Code using
+ Comet will need to be updated and recompiled to reflect the new package
+ name.</p>
+
+ </subsection>
+
+ <subsection name="XML validation">
+
+ <p>The configuration of XML validation has been simplified. The
+ <code>xmlValidation</code> and <code>xmlNamespaceAware</code> attributes
+ have been removed from the <code><Host></code> element. These
+ attributes, along with <code>tldValidation</code> and
+ <code>tldNamespaceAware</code>, are now set per <code><Context></code>
+ element. The defaults (<code>false</code> for each attribute) have not been
+ changed. However, in line with the requirements of the Servlet
+ specification, if the
+ <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system
+ property is set to <code>true</code>, XML validation and namespace
+ awareness will be enabled by default.</p>
+
+ </subsection>
+
+ <subsection name="System properties">
+
+ <p>The <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system
+ property has been modified to provide greater control over its effects. Each
+ behavioural change is now controlled by a dedicated system property. The
+ default behaviour is unchanged. The
+ <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> system property
+ now controls whether or not specification compliant defaults are used for
+ the other system properties. Even if
+ <code>org.apache.catalina.STRICT_SERVLET_COMPLIANCE</code> is
+ <code>true</code>, setting the individual system properties will always take
+ priority.</p>
+
+ <p>The <code>org.apache.coyote.MAX_TRAILER_SIZE</code> has been removed and
+ is replaced by the maxTrailerSize attribute of the Connector.</p>
+
+ </subsection>
+
+ <subsection name="Internal APIs">
+
+ <p>Whilst the Tomcat 7 internal API is broadly compatible with Tomcat 6
+ there have been many changes at the detail level and they are not binary
+ compatible. Developers of custom components that interact with Tomcat's
+ internals should review the JavaDoc for the relevant API. Of particular note
+ are:</p>
+ <ul>
+ <li>Use of generics.</li>
+ <li>A standard implementation of the Lifecycle interface that all
+ components extend.</li>
+ <li>The use of Context name rather than Context path as the unique
+ identifier for a Context within a Host.</li>
+ </ul>
+
+ </subsection>
+
+</section>
+
+<section name="Upgrading 7.0.x">
+ <p>When upgrading instances of Apache Tomcat from one version of Tomcat 7 to
+ another, particularly when using separate locations for $CATALINA_HOME and
+ $CATALINA_BASE, it is necessary to ensure that any changes in the
+ configuration files such as new attributes and changes to defaults are applied
+ as part of the upgrade. To assist with the identification of these changes,
+ the form below may be used to view the differences between the configuration
+ files in different versions of Tomcat 7.</p>
+
+ <subsection name="Tomcat 7.0.x configuration file differences">
+
+ <p>Select a configuration file, old version and new version from the boxes
+ below and then click "View differences" to see the differences.
+ The differences will be shown in a new tab/window.</p>
+
+ <script type="text/javascript" language="JavaScript">
+ function updateTc7ActionUrl() {
+ var revisions = {
+ "HEAD":"HEAD",
+ "7.0.0":"954232",
+ "7.0.2":"982035",
+ "7.0.4":"1022637",
+ "7.0.5":"1038717",
+ "7.0.6":"1057288",
+ "7.0.8":"1067169",
+ "7.0.10":"1078282",
+ "7.0.11":"1080182",
+ "7.0.12":"1087797",
+ "7.0.14":"1101230",
+ "7.0.16":"1134562",
+ "7.0.19":"1146504",
+ "7.0.20":"1155255",
+ "7.0.21":"1162976",
+ "7.0.22":"1176599",
+ "7.0.23":"1203305"
+ };
+ var formSubmit= document.getElementById('tc7Submit');
+ var elementsSelect= document.getElementById('tc7Select').elements;
+ formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/" +
+ elementsSelect['filename'].value;
+ formSubmit.elements['r1'].value = revisions[elementsSelect['r1'].value];
+ formSubmit.elements['r2'].value = revisions[elementsSelect['r2'].value];
+ return true;
+ }
+ </script>
+
+ <form id="tc7Select" action="not-used">
+ <p>Configuration file:
+ <select name="filename">
+ <option value="conf/catalina.policy">catalina.policy</option>
+ <option value="conf/catalina.properties">catalina.properties</option>
+ <option value="conf/context.xml">context.xml</option>
+ <option value="conf/logging.properties">logging.properties</option>
+ <option value="conf/server.xml">server.xml</option>
+ <option value="conf/tomcat-users.xml">tomcat-users.xml</option>
+ <option value="conf/web.xml">web.xml</option>
+ </select>
+ </p>
+ <p>Old version:
+ <select name="r1">
+ <option value="7.0.0">7.0.0</option>
+ <option value="7.0.2">7.0.2</option>
+ <option value="7.0.4">7.0.4</option>
+ <option value="7.0.5">7.0.5</option>
+ <option value="7.0.6">7.0.6</option>
+ <option value="7.0.8">7.0.8</option>
+ <option value="7.0.10">7.0.10</option>
+ <option value="7.0.11">7.0.11</option>
+ <option value="7.0.12">7.0.12</option>
+ <option value="7.0.14">7.0.14</option>
+ <option value="7.0.16">7.0.16</option>
+ <option value="7.0.19">7.0.19</option>
+ <option value="7.0.20">7.0.20</option>
+ <option value="7.0.21">7.0.21</option>
+ <option value="7.0.22" selected="selected">7.0.22</option>
+ <option value="7.0.23">7.0.23</option>
+ </select>, new version:
+ <select name="r2">
+ <option value="7.0.0">7.0.0</option>
+ <option value="7.0.2">7.0.2</option>
+ <option value="7.0.4">7.0.4</option>
+ <option value="7.0.5">7.0.5</option>
+ <option value="7.0.6">7.0.6</option>
+ <option value="7.0.8">7.0.8</option>
+ <option value="7.0.10">7.0.10</option>
+ <option value="7.0.11">7.0.11</option>
+ <option value="7.0.12">7.0.12</option>
+ <option value="7.0.14">7.0.14</option>
+ <option value="7.0.16">7.0.16</option>
+ <option value="7.0.19">7.0.19</option>
+ <option value="7.0.20">7.0.20</option>
+ <option value="7.0.21">7.0.21</option>
+ <option value="7.0.22">7.0.22</option>
+ <option value="7.0.23" selected="selected">7.0.23</option>
+ <option value="HEAD">trunk (unreleased)</option>
+ </select>
+ </p>
+ </form>
+ <form id="tc7Submit" action="to-be-replaced" method="get"
+ target="_blank">
+ <p>
+ <input type="hidden" name="diff_format" value="h"/>
+ <input type="hidden" name="r1" /><input type="hidden" name="r2" />
+ <input type="submit" value="View Differences"
+ onClick="return updateTc7ActionUrl();"/>
+ </p>
+ </form>
+ <p>You can also use Subversion command similar to the following (all on one line):</p>
+ <pre> svn diff
+ --old=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_22/conf/
+ --new=http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_23/conf/
+ </pre>
+ </subsection>
+
+</section>
+
+</body>
+</document>
Propchange: tomcat/site/trunk/xdocs/migration-7.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org