Author: markt
Date: Fri Mar 25 21:52:10 2016
New Revision: 1736671
URL: http://svn.apache.org/viewvc?rev=1736671&view=rev
Log:
Add 8.5.x to 9.0.x section. Add config file diffs for 9.0.x
Modified:
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/xdocs/migration-9.xml
Modified: tomcat/site/trunk/docs/migration-9.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1736671&r1=1736670&r2=1736671&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Fri Mar 25 21:52:10 2016
@@ -221,22 +221,22 @@
<a href="#Migrating_from_8.0.x_to_9.0.x">Migrating from 8.0.x to 9.0.x</a>
<ol>
<li>
-<a href="#Java_8_required">Java 8 required</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/Java_8_required">Java 8 required</a>
</li>
<li>
-<a href="#Specification_APIs">Specification APIs</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/Specification_APIs">Specification
APIs</a>
</li>
<li>
-<a href="#Servlet_4.0_API">Servlet 4.0 API</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</a>
</li>
<li>
-<a href="#JavaServer_Pages_2.4">JavaServer Pages 2.4</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</a>
</li>
<li>
-<a href="#Expression_Language_3.1">Expression Language 3.1</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</a>
</li>
<li>
-<a href="#WebSocket_2.0">WebSocket 2.0</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</a>
</li>
<li>
<a href="#BIO_connector_removed">BIO connector removed</a>
@@ -251,7 +251,41 @@
<a href="#TLS_virtual_hosting_and_multiple_certificate_support_added">TLS
virtual hosting and multiple certificate support added</a>
</li>
<li>
-<a href="#Internal_APIs">Internal APIs</a>
+<a href="#Migrating_from_8.0.x_to_9.0.x/Internal_APIs">Internal APIs</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x">Migrating from 8.5.x to 9.0.x</a>
+<ol>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/Java_8_required">Java 8 required</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/Specification_APIs">Specification
APIs</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</a>
+</li>
+<li>
+<a href="#Migrating_from_8.5.x_to_9.0.x/Internal_APIs">Internal APIs</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#Upgrading_9.0.x">Upgrading 9.0.x</a>
+<ol>
+<li>
+<a href="#Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x
configuration file differences</a>
</li>
</ol>
</li>
@@ -277,7 +311,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Java_8_required">Java 8 required</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/Java_8_required">Java 8 required</h4>
<div class="text">
@@ -290,7 +324,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Specification_APIs">Specification APIs</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/Specification_APIs">Specification
APIs</h4>
<div class="text">
@@ -307,7 +341,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Servlet_4.0_API">Servlet 4.0 API</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</h4>
<div class="text">
@@ -338,7 +372,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="JavaServer_Pages_2.4">JavaServer Pages 2.4</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</h4>
<div class="text">
@@ -351,7 +385,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Expression_Language_3.1">Expression Language 3.1</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</h4>
<div class="text">
@@ -365,7 +399,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="WebSocket_2.0">WebSocket 2.0</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</h4>
<div class="text">
@@ -479,7 +513,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Internal_APIs">Internal APIs</h4>
+<h4 id="Migrating_from_8.0.x_to_9.0.x/Internal_APIs">Internal APIs</h4>
<div class="text">
@@ -508,6 +542,235 @@ of Apache Tomcat.</p>
</div>
+<h3 id="Migrating_from_8.5.x_to_9.0.x">Migrating from 8.5.x to 9.0.x</h3>
+<div class="text">
+
+
+<p> This section lists all the known changes between 8.0.x and 9.0.x which may
+ cause backwards compatibility problems when upgrading.</p>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/Java_8_required">Java 8 required</h4>
+<div class="text">
+
+
+<p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x
+ required Java 7.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/Specification_APIs">Specification
APIs</h4>
+<div class="text">
+
+
+<p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
+ Java Unified Expression Language 3.1 and Java WebSocket 2.0
+ <a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a>.
+ The changes between versions of specifications may be found in the
+ <em>Changes</em> appendix in each of specification documents.
+ </p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</h4>
+<div class="text">
+
+
+<p>In JSP pages that use wildcard import syntax the new classes added in
+ Servlet API may conflict with ones in web applications.
+ For example, if package <code>"a"</code> contains class
+ <code>PushBuilder</code>, the following JSP page will cease to compile in
+ Tomcat 9:</p>
+
+
+<div class="codeBox">
+<pre>
+<code><%@page import="a.*"%>
+<% PushBuilder pushBuilder = new PushBuilder(); %></code>
+</pre>
+</div>
+
+
+<p>This happens because the implicit import of
+ <code>javax.servlet.http.*</code> and the explicit import of
+ <code>a.*</code> will provide conflicting definitions of class
+ <code>PushBuilder</code> that was added in Servlet 4.0. The solution is to
+ use the explicit import, <code>import="a.PushBuilder"</code>.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</h4>
+<div class="text">
+
+
+<p>No information is currently available. It is anticipated that Java EE 8
+ will include a maintenance release of JSP with a version of 2.4.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</h4>
+<div class="text">
+
+
+<p>No information is currently available. It is anticipated that Java EE 8
+ will include a maintenance release of expression language with a version of
+ 3.1.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</h4>
+<div class="text">
+
+
+<p>No information is currently available. It is anticipated that Java EE 8
+ will include an updated WebSocket specification with a version of 2.0.</p>
+
+
+</div>
+</div>
+
+
+<div class="subsection">
+<h4 id="Migrating_from_8.5.x_to_9.0.x/Internal_APIs">Internal APIs</h4>
+<div class="text">
+
+
+<p>Whilst the Tomcat 9 internal API is broadly compatible with Tomcat 8.5
+ there have been some 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.</p>
+
+
+</div>
+</div>
+
+
+</div>
+<h3 id="Upgrading_9.0.x">Upgrading 9.0.x</h3>
+<div class="text">
+
+<p>When upgrading instances of Apache Tomcat from one version of Tomcat 9 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 9.</p>
+
+
+<div class="subsection">
+<h4 id="Tomcat_9.0.x_configuration_file_differences">Tomcat 9.0.x
configuration file differences</h4>
+<div class="text">
+
+
+<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">
+ "use strict"; // Enable strict mode
+
+ document.addEventListener("DOMContentLoaded", function() {
+ var formSubmit = document.getElementById("tc9Submit");
+ formSubmit.addEventListener("submit", function() {
+ var revisions = {
+ "HEAD":"HEAD",
+ "9.0.0.M1":"1714130",
+ "9.0.0.M3":"1728005",
+ "9.0.0.M4":"1734692"
+ };
+
+ formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/"; +
+ document.getElementById('select-filename').value;
+ formSubmit.elements['r1'].value =
revisions[document.getElementById('select-r1').value];
+ formSubmit.elements['r2'].value =
revisions[document.getElementById('select-r2').value];
+ return true;
+ }, false);
+ }, false);
+ </script>
+
+
+
+<p>
+<label>Configuration file:
+ <select id="select-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></label>
+
+</p>
+
+<p>
+<label>Old version:
+ <select id="select-r1">
+ <option value="9.0.0.M1">9.0.0.M1</option>
+ <option value="9.0.0.M3" selected>9.0.0.M3</option>
+ <option value="9.0.0.M4">9.0.0.M4</option>
+ </select>,</label> <label>new version:
+ <select id="select-r2">
+ <option value="9.0.0.M1">9.0.0.M1</option>
+ <option value="9.0.0.M3">9.0.0.M3</option>
+ <option value="9.0.0.M4" selected>9.0.0.M4</option>
+ <option value="HEAD">trunk (unreleased)</option>
+ </select></label>
+
+</p>
+
+
+<form id="tc9Submit" 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">
+ <button>View Differences</button>
+
+</p>
+
+</form>
+
+<p>You can also use Subversion command similar to the following (all on one
line):</p>
+
+<div class="codeBox">
+<pre>
+<code>svn diff
+ --old=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M1/conf/
+
--new=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M3/conf/</code>
+</pre>
+</div>
+
+</div>
+</div>
+
+
+</div>
</div>
</div>
</div>
Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1736671&r1=1736670&r2=1736671&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Fri Mar 25 21:52:10 2016
@@ -171,5 +171,159 @@ of Apache Tomcat.</p>
</section>
+<section name="Migrating from 8.5.x to 9.0.x">
+
+ <p> This section lists all the known changes between 8.0.x and 9.0.x which
may
+ cause backwards compatibility problems when upgrading.</p>
+
+ <subsection name="Java 8 required">
+
+ <p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x
+ required Java 7.</p>
+
+ </subsection>
+
+ <subsection name="Specification APIs">
+
+ <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
+ Java Unified Expression Language 3.1 and Java WebSocket 2.0
+ <a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a>.
+ The changes between versions of specifications may be found in the
+ <em>Changes</em> appendix in each of specification documents.
+ </p>
+
+ </subsection>
+
+ <subsection name="Servlet 4.0 API">
+
+ <p>In JSP pages that use wildcard import syntax the new classes added in
+ Servlet API may conflict with ones in web applications.
+ For example, if package <code>"a"</code> contains class
+ <code>PushBuilder</code>, the following JSP page will cease to compile in
+ Tomcat 9:</p>
+
+ <source><![CDATA[<%@page import="a.*"%>
+<% PushBuilder pushBuilder = new PushBuilder(); %>]]></source>
+
+ <p>This happens because the implicit import of
+ <code>javax.servlet.http.*</code> and the explicit import of
+ <code>a.*</code> will provide conflicting definitions of class
+ <code>PushBuilder</code> that was added in Servlet 4.0. The solution is to
+ use the explicit import, <code>import="a.PushBuilder"</code>.</p>
+
+ </subsection>
+
+ <subsection name="JavaServer Pages 2.4">
+
+ <p>No information is currently available. It is anticipated that Java EE 8
+ will include a maintenance release of JSP with a version of 2.4.</p>
+
+ </subsection>
+
+ <subsection name="Expression Language 3.1">
+
+ <p>No information is currently available. It is anticipated that Java EE 8
+ will include a maintenance release of expression language with a version of
+ 3.1.</p>
+
+ </subsection>
+
+ <subsection name="WebSocket 2.0">
+
+ <p>No information is currently available. It is anticipated that Java EE 8
+ will include an updated WebSocket specification with a version of 2.0.</p>
+
+ </subsection>
+
+ <subsection name="Internal APIs">
+
+ <p>Whilst the Tomcat 9 internal API is broadly compatible with Tomcat 8.5
+ there have been some 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.</p>
+
+ </subsection>
+
+</section>
+
+<section name="Upgrading 9.0.x">
+ <p>When upgrading instances of Apache Tomcat from one version of Tomcat 9 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 9.</p>
+
+ <subsection name="Tomcat 9.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"><![CDATA[
+ "use strict"; // Enable strict mode
+
+ document.addEventListener("DOMContentLoaded", function() {
+ var formSubmit = document.getElementById("tc9Submit");
+ formSubmit.addEventListener("submit", function() {
+ var revisions = {
+ "HEAD":"HEAD",
+ "9.0.0.M1":"1714130",
+ "9.0.0.M3":"1728005",
+ "9.0.0.M4":"1734692"
+ };
+
+ formSubmit.action = "http://svn.apache.org/viewvc/tomcat/trunk/"; +
+ document.getElementById('select-filename').value;
+ formSubmit.elements['r1'].value =
revisions[document.getElementById('select-r1').value];
+ formSubmit.elements['r2'].value =
revisions[document.getElementById('select-r2').value];
+ return true;
+ }, false);
+ }, false);
+ ]]></script>
+
+
+ <p><label>Configuration file:
+ <select id="select-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></label>
+ </p>
+ <p><label>Old version:
+ <select id="select-r1">
+ <option value="9.0.0.M1">9.0.0.M1</option>
+ <option value="9.0.0.M3" selected="selected">9.0.0.M3</option>
+ <option value="9.0.0.M4">9.0.0.M4</option>
+ </select>,</label> <label>new version:
+ <select id="select-r2">
+ <option value="9.0.0.M1">9.0.0.M1</option>
+ <option value="9.0.0.M3">9.0.0.M3</option>
+ <option value="9.0.0.M4" selected="selected">9.0.0.M4</option>
+ <option value="HEAD">trunk (unreleased)</option>
+ </select></label>
+ </p>
+
+ <form id="tc9Submit" 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"/>
+ <button>View Differences</button>
+ </p>
+ </form>
+ <p>You can also use Subversion command similar to the following (all on
one line):</p>
+ <source>svn diff
+ --old=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M1/conf/
+
--new=http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M3/conf/</source>
+ </subsection>
+
+</section>
+
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
