Author: kkolinko
Date: Wed Jun 8 00:43:33 2016
New Revision: 1747330
URL: http://svn.apache.org/viewvc?rev=1747330&view=rev
Log:
Merge "from 8.0" and "from 8.5" sections of Tomcat 9.0 migration guide to
simplify reading and maintenance of this document. Also WebSocket spec is
officially titled "Java API for WebSocket".
Modified:
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/migration-85.html
tomcat/site/trunk/docs/migration-9.html
tomcat/site/trunk/docs/migration.html
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/migration-85.xml
tomcat/site/trunk/xdocs/migration-9.xml
tomcat/site/trunk/xdocs/migration.xml
Modified: tomcat/site/trunk/docs/migration-8.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Wed Jun 8 00:43:33 2016
@@ -310,7 +310,7 @@ of Apache Tomcat.</p>
<p>Apache Tomcat 8 supports the Java Servlet 3.1, JavaServer Pages 2.3,
- Java Unified Expression Language 3.0 and Java WebSocket 1.1
+ Java Unified Expression Language 3.0 and Java API for WebSocket 1.1
<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.
Modified: tomcat/site/trunk/docs/migration-85.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Jun 8 00:43:33 2016
@@ -448,7 +448,7 @@ of Apache Tomcat.</p>
<p>
<code>MessageDispatch15Interceptor</code> had been used to add the Java 5
features to MessageDispatchInterceptor.
- <code>MessageDispatch15Interceptor</code> has been removed in Tomcat8.5.x
+ <code>MessageDispatch15Interceptor</code> has been removed in Tomcat 8.5.x
by merging the Java 5 features to <code>MessageDispatchInterceptor</code>.
</p>
Modified: tomcat/site/trunk/docs/migration-9.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Jun 8 00:43:33 2016
@@ -219,25 +219,25 @@
<a href="#General">General</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x">Migrating from 8.0.x to 9.0.x</a>
+<a href="#Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or
8.5.x to 9.0.x</a>
<ol>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/Java_8_required">Java 8 required</a>
+<a href="#Java_8_required">Java 8 required</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/Specification_APIs">Specification
APIs</a>
+<a href="#Specification_APIs">Specification APIs</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</a>
+<a href="#Servlet_4.0_API">Servlet 4.0 API</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</a>
+<a href="#JavaServer_Pages_2.4">JavaServer Pages 2.4</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</a>
+<a href="#Expression_Language_3.1">Expression Language 3.1</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</a>
+<a href="#WebSocket_2.0">WebSocket 2.0</a>
</li>
<li>
<a href="#BIO_connector_removed">BIO connector removed</a>
@@ -252,7 +252,7 @@
<a href="#TLS_virtual_hosting_and_multiple_certificate_support_added">TLS
virtual hosting and multiple certificate support added</a>
</li>
<li>
-<a href="#Migrating_from_8.0.x_to_9.0.x/Internal_APIs">Internal APIs</a>
+<a href="#Internal_APIs">Internal APIs</a>
</li>
<li>
<a href="#JSR-77_implementation_removed">JSR-77 implementation removed</a>
@@ -263,32 +263,6 @@
</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>
@@ -309,20 +283,21 @@ of Apache Tomcat.</p>
</div>
-<h3 id="Migrating_from_8.0.x_to_9.0.x">Migrating from 8.0.x to 9.0.x</h3>
+<h3 id="Migrating_from_8.0.x_or_8.5.x_to_9.0.x">Migrating from 8.0.x or 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>
+<p>This section lists all the known changes between 8.0.x / 8.5.x and 9.0.x
+ which may cause backwards compatibility problems when upgrading. Some of
+ these changes and new features are already present in Apache Tomcat
8.5.x.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/Java_8_required">Java 8 required</h4>
+<h4 id="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
+<p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x and 8.5.x
required Java 7.</p>
@@ -331,12 +306,12 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/Specification_APIs">Specification
APIs</h4>
+<h4 id="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
+ Java Unified Expression Language 3.1 and Java API for 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.
@@ -348,7 +323,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/Servlet_4.0_API">Servlet 4.0 API</h4>
+<h4 id="Servlet_4.0_API">Servlet 4.0 API</h4>
<div class="text">
@@ -379,7 +354,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/JavaServer_Pages_2.4">JavaServer Pages
2.4</h4>
+<h4 id="JavaServer_Pages_2.4">JavaServer Pages 2.4</h4>
<div class="text">
@@ -392,7 +367,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/Expression_Language_3.1">Expression
Language 3.1</h4>
+<h4 id="Expression_Language_3.1">Expression Language 3.1</h4>
<div class="text">
@@ -406,12 +381,13 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/WebSocket_2.0">WebSocket 2.0</h4>
+<h4 id="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>
+ will include an updated Java API for WebSocket specification with a
+ version of 2.0.</p>
</div>
@@ -423,6 +399,11 @@ of Apache Tomcat.</p>
<div class="text">
+<p>
+<em>The following change is present in 8.5.0 onwards.</em>
+</p>
+
+
<p>The Java blocking IO implementation (BIO) for both HTTP and AJP has been
removed. Users are recommended to switch to the Java non-blocking IO
implementation (NIO).</p>
@@ -437,6 +418,11 @@ of Apache Tomcat.</p>
<div class="text">
+<p>
+<em>The following change is present in 8.5.0 onwards.</em>
+</p>
+
+
<p>Comet support has been removed without a direct replacement. Applications
using Comet are recommended to migrate to WebSockets.</p>
@@ -450,6 +436,11 @@ of Apache Tomcat.</p>
<div class="text">
+<p>
+<em>The following feature is available since 8.5.0 onwards.</em>
+</p>
+
+
<p>HTTP/2 is supported for h2 (over TLS, negotiated via ALPN) and h2c (clear
text, negotiated via HTTP/1.1 upgrade). HTTP/2 needs to be explicitly
enabled for a connector. To enable it, insert
@@ -472,6 +463,11 @@ of Apache Tomcat.</p>
<div class="text">
+<p>
+<em>The following feature is available since 8.5.0 onwards.</em>
+</p>
+
+
<p>Tomcat 9 supports multiple TLS virtual hosts for a single connector with
each virtual host able to support multiple certificates. Virtual host
definitions are nested inside the Connector element with the default
@@ -520,7 +516,7 @@ of Apache Tomcat.</p>
<div class="subsection">
-<h4 id="Migrating_from_8.0.x_to_9.0.x/Internal_APIs">Internal APIs</h4>
+<h4 id="Internal_APIs">Internal APIs</h4>
<div class="text">
@@ -536,10 +532,10 @@ of Apache Tomcat.</p>
<li>Significant refactoring has taken place throughout the connectors to
reduce duplicate code and to align behaviour across
- implementations.</li>
+ implementations. (<em>This change is present in 8.5.x.</em>)</li>
<li>The deprecated <code>digest</code> attribute has been removed from the
- <code>Realm</code>.</li>
+ <code>Realm</code>. (<em>This change is present in 8.5.x.</em>)</li>
</ul>
@@ -553,7 +549,12 @@ of Apache Tomcat.</p>
<div class="text">
-<p>The JSR-77 implementation is incomplete and has been removed in 9.0.x.
+<p>
+<em>The following change is present in 8.5.0 onwards.</em>
+</p>
+
+
+<p>The JSR-77 implementation is incomplete and has been removed in 8.5.x and
9.0.x.
Specifically, the following methods that exposed to JMX have been removed.
</p>
@@ -588,139 +589,19 @@ of Apache Tomcat.</p>
<p>
+<em>The following change is present in 8.5.0 onwards.</em>
+</p>
+
+
+<p>
<code>MessageDispatch15Interceptor</code> had been used to add the Java 5
features to MessageDispatchInterceptor.
- <code>MessageDispatch15Interceptor</code> has been removed in Tomcat8.5.x
+ <code>MessageDispatch15Interceptor</code> has been removed in Tomcat 8.5.x
and 9.0.x
by merging the Java 5 features to <code>MessageDispatchInterceptor</code>.
</p>
</div>
-</div>
-
-
-</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>
Modified: tomcat/site/trunk/docs/migration.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Wed Jun 8 00:43:33 2016
@@ -246,14 +246,13 @@ accordingly.</p>
9.0.x Migration Guide.</p>
-<p>For migration from 8.5.x to 9.0.x, see the
-<a href="migration-9.html#Migrating_from_8.5.x_to_9.0.x">8.5.x</a> section of
-the Tomcat 9.0.x Migration Guide.</p>
+<p>For migration from 8.0.x / 8.5.x to 9.0.x, see the
+<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.</p>
-<p>For migration from 8.0.x to 9.0.x, see the
-<a href="migration-9.html#Migrating_from_8.0.x_to_9.0.x">8.0.x</a> section of
-the Tomcat 9.0.x Migration Guide.</p>
+<p>For upgrading between 8.5.x versions, see the
+<a href="migration-85.html#Upgrading_8.5.x">upgrading</a> section of the Tomcat
+8.5.x Migration Guide.</p>
<p>For migration from 8.0.x to 8.5.x, see the
Modified: tomcat/site/trunk/xdocs/migration-8.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-8.xml (original)
+++ tomcat/site/trunk/xdocs/migration-8.xml Wed Jun 8 00:43:33 2016
@@ -35,7 +35,7 @@ of Apache Tomcat.</p>
<subsection name="Specification APIs">
<p>Apache Tomcat 8 supports the Java Servlet 3.1, JavaServer Pages 2.3,
- Java Unified Expression Language 3.0 and Java WebSocket 1.1
+ Java Unified Expression Language 3.0 and Java API for WebSocket 1.1
<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.
Modified: tomcat/site/trunk/xdocs/migration-85.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-85.xml?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Wed Jun 8 00:43:33 2016
@@ -20,14 +20,15 @@ of Apache Tomcat.</p>
</section>
-<section name="Migrating from 8.0.x to 9.0.x">
+<section name="Migrating from 8.0.x or 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>
+ <p>This section lists all the known changes between 8.0.x / 8.5.x and 9.0.x
+ which may cause backwards compatibility problems when upgrading. Some of
+ these changes and new features are already present in Apache Tomcat
8.5.x.</p>
<subsection name="Java 8 required">
- <p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x
+ <p>Apache Tomcat 9.0.x requires Java 8 or later. Apache Tomcat 8.0.x and
8.5.x
required Java 7.</p>
</subsection>
@@ -35,7 +36,7 @@ of Apache Tomcat.</p>
<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
+ Java Unified Expression Language 3.1 and Java API for 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.
@@ -80,12 +81,15 @@ of Apache Tomcat.</p>
<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>
+ will include an updated Java API for WebSocket specification with a
+ version of 2.0.</p>
</subsection>
<subsection name="BIO connector removed">
+ <p><em>The following change is present in 8.5.0 onwards.</em></p>
+
<p>The Java blocking IO implementation (BIO) for both HTTP and AJP has been
removed. Users are recommended to switch to the Java non-blocking IO
implementation (NIO).</p>
@@ -94,6 +98,8 @@ of Apache Tomcat.</p>
<subsection name="Comet support removed">
+ <p><em>The following change is present in 8.5.0 onwards.</em></p>
+
<p>Comet support has been removed without a direct replacement.
Applications
using Comet are recommended to migrate to WebSockets.</p>
@@ -101,6 +107,8 @@ of Apache Tomcat.</p>
<subsection name="HTTP/2 support added">
+ <p><em>The following feature is available since 8.5.0 onwards.</em></p>
+
<p>HTTP/2 is supported for h2 (over TLS, negotiated via ALPN) and h2c
(clear
text, negotiated via HTTP/1.1 upgrade). HTTP/2 needs to be explicitly
enabled for a connector. To enable it, insert
@@ -113,6 +121,8 @@ of Apache Tomcat.</p>
<subsection name="TLS virtual hosting and multiple certificate support
added">
+ <p><em>The following feature is available since 8.5.0 onwards.</em></p>
+
<p>Tomcat 9 supports multiple TLS virtual hosts for a single connector with
each virtual host able to support multiple certificates. Virtual host
definitions are nested inside the Connector element with the default
@@ -162,16 +172,18 @@ of Apache Tomcat.</p>
<ul>
<li>Significant refactoring has taken place throughout the connectors to
reduce duplicate code and to align behaviour across
- implementations.</li>
+ implementations. (<em>This change is present in 8.5.x.</em>)</li>
<li>The deprecated <code>digest</code> attribute has been removed from
the
- <code>Realm</code>.</li>
+ <code>Realm</code>. (<em>This change is present in 8.5.x.</em>)</li>
</ul>
</subsection>
<subsection name="JSR-77 implementation removed">
- <p>The JSR-77 implementation is incomplete and has been removed in 9.0.x.
+ <p><em>The following change is present in 8.5.0 onwards.</em></p>
+
+ <p>The JSR-77 implementation is incomplete and has been removed in 8.5.x
and 9.0.x.
Specifically, the following methods that exposed to JMX have been removed.
</p>
@@ -185,89 +197,16 @@ of Apache Tomcat.</p>
<subsection name="Clustering">
+ <p><em>The following change is present in 8.5.0 onwards.</em></p>
+
<p><code>MessageDispatch15Interceptor</code> had been used to add the Java
5
features to MessageDispatchInterceptor.
- <code>MessageDispatch15Interceptor</code> has been removed in Tomcat9.0.x
+ <code>MessageDispatch15Interceptor</code> has been removed in Tomcat 8.5.x
and 9.0.x
by merging the Java 5 features to <code>MessageDispatchInterceptor</code>.
</p>
</subsection>
-</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">
Modified: tomcat/site/trunk/xdocs/migration.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=1747330&r1=1747329&r2=1747330&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration.xml (original)
+++ tomcat/site/trunk/xdocs/migration.xml Wed Jun 8 00:43:33 2016
@@ -36,13 +36,12 @@ accordingly.</p>
<a href="migration-9.html#Upgrading_9.0.x">upgrading</a> section of the Tomcat
9.0.x Migration Guide.</p>
-<p>For migration from 8.5.x to 9.0.x, see the
-<a href="migration-9.html#Migrating_from_8.5.x_to_9.0.x">8.5.x</a> section of
-the Tomcat 9.0.x Migration Guide.</p>
+<p>For migration from 8.0.x / 8.5.x to 9.0.x, see the
+<a href="migration-9.html">Tomcat 9.0.x Migration Guide</a>.</p>
-<p>For migration from 8.0.x to 9.0.x, see the
-<a href="migration-9.html#Migrating_from_8.0.x_to_9.0.x">8.0.x</a> section of
-the Tomcat 9.0.x Migration Guide.</p>
+<p>For upgrading between 8.5.x versions, see the
+<a href="migration-85.html#Upgrading_8.5.x">upgrading</a> section of the Tomcat
+8.5.x Migration Guide.</p>
<p>For migration from 8.0.x to 8.5.x, see the
<a href="migration-85.html">Tomcat 8.5.x Migration Guide</a>.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
