Author: markt
Date: Tue May 14 09:40:25 2024
New Revision: 1917717

URL: http://svn.apache.org/viewvc?rev=1917717&view=rev
Log:
Jakarta Server Pages -> Jakarta Pages

Modified:
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/migration-10.1.html
    tomcat/site/trunk/docs/migration-10.html
    tomcat/site/trunk/docs/migration-11.0.html
    tomcat/site/trunk/docs/oldnews-2020.html
    tomcat/site/trunk/tools/email-template-10.1.txt
    tomcat/site/trunk/tools/email-template-11.0.txt
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/migration-10.1.xml
    tomcat/site/trunk/xdocs/migration-10.xml
    tomcat/site/trunk/xdocs/migration-11.0.xml
    tomcat/site/trunk/xdocs/oldnews-2020.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue May 14 09:40:25 2024
@@ -4,7 +4,7 @@
 <p>The Apache Tomcat<sup>&reg;</sup> software is an open source implementation
 of the
 <a href="https://projects.eclipse.org/projects/ee4j.servlet"; 
rel="nofollow">Jakarta Servlet</a>,
-<a href="https://projects.eclipse.org/projects/ee4j.jsp"; 
rel="nofollow">Jakarta Server Pages</a>,
+<a href="https://projects.eclipse.org/projects/ee4j.jsp"; 
rel="nofollow">Jakarta Pages</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.el"; rel="nofollow">Jakarta 
Expression Language</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.websocket"; 
rel="nofollow">Jakarta WebSocket</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.ca"; rel="nofollow">Jakarta 
Annotations</a> and

Modified: tomcat/site/trunk/docs/migration-10.1.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.1.html?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-10.1.html (original)
+++ tomcat/site/trunk/docs/migration-10.1.html Tue May 14 09:40:25 2024
@@ -1,6 +1,6 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; 
charset=UTF-8"><meta name="viewport" content="width=device-width, 
initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" 
type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" 
type="text/css"><title>Apache Tomcat&reg; - Migration Guide - Tomcat 
10.1.x</title><meta name="author" content="Apache Tomcat Project"><script 
src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div
 id="wrapper"><header id="header"><div class="clearfix"><div 
class="menu-toggler pull-left" tabindex="1"><div 
class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a><h1 class="pull-left">Apache 
Tomcat<sup>&reg;</sup></h1><div class="asf-logos pull-right"><a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img src="https://www.apache.org/images/S
 upportApache-small.png" class="support-asf" alt="Support Apache"></a><a 
href="http://www.apache.org/"; target="_blank" class="pull-left"><img 
src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software 
Foundation"></a></div></div></header><main id="middle"><div><div 
id="mainLeft"><div id="nav-wrapper"><form 
action="https://www.google.com/search"; method="get"><div 
class="searchbox"><input value="tomcat.apache.org" name="sitesearch" 
type="hidden"><input aria-label="Search text" placeholder="Search&hellip;" 
required="required" name="q" id="query" 
type="search"><button>GO</button></div></form><div class="asfevents"><a 
class="acevent" data-format="square" 
data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a 
href="./index.html">Home</a></li><li><a 
href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven 
Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a 
href="./whichversion.html">Which version?</a></li><li><a href="https://tomcat.ap
 ache.org/download-11.cgi">Tomcat 11 (alpha)</a></li><li><a 
href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a 
href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EE</a></li><li><a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a></li><li><a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat 
Native</a></li><li><a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a
 href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a 
href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li
 ><li><a href="./upgrading.html">Upgrading</a></li><li><a 
 >href="./connectors-doc/index.html">Tomcat Connectors</a></li><li><a 
 >href="./native-doc/index.html">Tomcat Native 2</a></li><li><a 
 >href="./native-1.3-doc/index.html">Tomcat Native 1.3</a></li><li><a 
 >href="./native-1.2-doc/index.html">Tomcat Native 1.2</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a 
 >href="./migration.html">Migration Guide</a></li><li><a 
 >href="./presentations.html">Presentations</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a
 > href="./security.html">Security Reports</a></li><li><a 
 >href="./findhelp.html">Find help</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a
 > href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug 
 >Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get 
 >Involved</h2><ul><li><a h
 ref="./getinvolved.html">Overview</a></li><li><a href="./source.html">Source 
code</a></li><li><a href="./ci.html">Buildbot</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a 
href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a 
href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a 
href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a
 href="./whoweare.html">Who We Are</a></li><li><a 
href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a
 href="./heritage.html">Heritage</a></li><li><a 
href="http://www.apache.org";>Apache Home</a></li><li><a 
href="./resources.html">Resources</a></li><li><a 
href="./contact.html">Contact</a></li><li><a 
href="./legal.html">Legal</a></li><li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li
 ><li><a href="https://www.apache.org/foundation/contributing.html";>Support 
 >Apache</a></li><li><a 
 >href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 > href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a 
 >href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div
 > id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 
 >id="Table_of_Contents">Table of Contents</h3><div class="text">
-<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_10.0.x_to_10.1.x">Migrating from 10.0.x to 
10.1.x</a><ol><li><a href="#Java_11_required">Java 11 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_6.0_API">Servlet 6.0 API</a></li><li><a 
href="#Server_Pages_3.1">Server Pages 3.1</a></li><li><a 
href="#Expression_Language_5.0">Expression Language 5.0</a></li><li><a 
href="#WebSocket_2.1">WebSocket 2.1</a></li><li><a 
href="#Authentication_TBD">Authentication TBD</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li></ol></li><li><a 
href="#Upgrading_10.1.x">Upgrading 10.1.x</a><ol><li><a 
href="#Tomcat_10.1.x_noteable_changes">Tomcat 10.1.x noteable 
changes</a></li><li><a 
href="#Tomcat_10.1.x_configuration_file_differences">Tomcat 10.1.x 
configuration file differences</a></li></ol></li></ul>
+<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_10.0.x_to_10.1.x">Migrating from 10.0.x to 
10.1.x</a><ol><li><a href="#Java_11_required">Java 11 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_6.0_API">Servlet 6.0 API</a></li><li><a href="#Pages_3.1">Pages 
3.1</a></li><li><a href="#Expression_Language_5.0">Expression Language 
5.0</a></li><li><a href="#WebSocket_2.1">WebSocket 2.1</a></li><li><a 
href="#Authentication_TBD">Authentication TBD</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li></ol></li><li><a 
href="#Upgrading_10.1.x">Upgrading 10.1.x</a><ol><li><a 
href="#Tomcat_10.1.x_noteable_changes">Tomcat 10.1.x noteable 
changes</a></li><li><a 
href="#Tomcat_10.1.x_configuration_file_differences">Tomcat 10.1.x 
configuration file differences</a></li></ol></li></ul>
 </div><h3 id="General">General</h3><div class="text">
 
 <p>Please read the general <a href="migration.html">Migration Guide page</a>
@@ -22,7 +22,7 @@ versions of Apache Tomcat<sup>&reg;</sup
   <div class="subsection"><h4 id="Specification_APIs">Specification 
APIs</h4><div class="text">
 
     <p>Apache Tomcat 10.1 supports the Jakarta Servlet 6.0,
-    Jakarta Server Pages 3.1, Jakarta Expression Language 5.0,
+    Jakarta Pages 3.1, Jakarta Expression Language 5.0,
     JakartaWebSocket 2.1 and Jakarta Authentication 3.0
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -47,7 +47,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 
   </div></div>
 
-  <div class="subsection"><h4 id="Server_Pages_3.1">Server Pages 3.1</h4><div 
class="text">
+  <div class="subsection"><h4 id="Pages_3.1">Pages 3.1</h4><div class="text">
 
     <p>Added an option to raise a <code>PropertyNotFoundException</code> when 
an
     EL expression contains an unknown identifier.</p>

Modified: tomcat/site/trunk/docs/migration-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-10.html?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-10.html (original)
+++ tomcat/site/trunk/docs/migration-10.html Tue May 14 09:40:25 2024
@@ -1,6 +1,6 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; 
charset=UTF-8"><meta name="viewport" content="width=device-width, 
initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" 
type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" 
type="text/css"><title>Apache Tomcat&reg; - Migration Guide - Tomcat 
10.0.x</title><meta name="author" content="Apache Tomcat Project"><script 
src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div
 id="wrapper"><header id="header"><div class="clearfix"><div 
class="menu-toggler pull-left" tabindex="1"><div 
class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a><h1 class="pull-left">Apache 
Tomcat<sup>&reg;</sup></h1><div class="asf-logos pull-right"><a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img src="https://www.apache.org/images/S
 upportApache-small.png" class="support-asf" alt="Support Apache"></a><a 
href="http://www.apache.org/"; target="_blank" class="pull-left"><img 
src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software 
Foundation"></a></div></div></header><main id="middle"><div><div 
id="mainLeft"><div id="nav-wrapper"><form 
action="https://www.google.com/search"; method="get"><div 
class="searchbox"><input value="tomcat.apache.org" name="sitesearch" 
type="hidden"><input aria-label="Search text" placeholder="Search&hellip;" 
required="required" name="q" id="query" 
type="search"><button>GO</button></div></form><div class="asfevents"><a 
class="acevent" data-format="square" 
data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a 
href="./index.html">Home</a></li><li><a 
href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven 
Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a 
href="./whichversion.html">Which version?</a></li><li><a href="https://tomcat.ap
 ache.org/download-11.cgi">Tomcat 11 (alpha)</a></li><li><a 
href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a 
href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EE</a></li><li><a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a></li><li><a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat 
Native</a></li><li><a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a
 href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a 
href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li
 ><li><a href="./upgrading.html">Upgrading</a></li><li><a 
 >href="./connectors-doc/index.html">Tomcat Connectors</a></li><li><a 
 >href="./native-doc/index.html">Tomcat Native 2</a></li><li><a 
 >href="./native-1.3-doc/index.html">Tomcat Native 1.3</a></li><li><a 
 >href="./native-1.2-doc/index.html">Tomcat Native 1.2</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a 
 >href="./migration.html">Migration Guide</a></li><li><a 
 >href="./presentations.html">Presentations</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a
 > href="./security.html">Security Reports</a></li><li><a 
 >href="./findhelp.html">Find help</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a
 > href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug 
 >Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get 
 >Involved</h2><ul><li><a h
 ref="./getinvolved.html">Overview</a></li><li><a href="./source.html">Source 
code</a></li><li><a href="./ci.html">Buildbot</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a 
href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a 
href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a 
href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a
 href="./whoweare.html">Who We Are</a></li><li><a 
href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a
 href="./heritage.html">Heritage</a></li><li><a 
href="http://www.apache.org";>Apache Home</a></li><li><a 
href="./resources.html">Resources</a></li><li><a 
href="./contact.html">Contact</a></li><li><a 
href="./legal.html">Legal</a></li><li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li
 ><li><a href="https://www.apache.org/foundation/contributing.html";>Support 
 >Apache</a></li><li><a 
 >href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 > href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a 
 >href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div
 > id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 
 >id="Table_of_Contents">Table of Contents</h3><div class="text">
-<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_9.0.x_to_10.0.x">Migrating from 9.0.x to 
10.0.x</a><ol><li><a href="#Java_8_required">Java 8 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_5.0_API">Servlet 5.0 API</a></li><li><a 
href="#Server_Pages_3.0">Server Pages 3.0</a></li><li><a 
href="#Expression_Language_4.0">Expression Language 4.0</a></li><li><a 
href="#WebSocket_2.0">WebSocket 2.0</a></li><li><a 
href="#Authentication_4.0">Authentication 4.0</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li><li><a 
href="#web.xml_defaults">web.xml defaults</a></li><li><a 
href="#Session_management">Session management</a></li><li><a 
href="#HTTP/2">HTTP/2</a></li><li><a href="#Logging">Logging</a></li><li><a 
href="#Access_Log_Patterns">Access Log Patterns</a></li></ol></li><li><a 
href="#Upgrading_10.0.x">Upgrading 10.0.x</a><ol><li><a 
href="#Tomcat_10.0.x_noteable_changes">Tomcat 10.0.x noteable changes</a></li>
 <li><a href="#Tomcat_10.0.x_configuration_file_differences">Tomcat 10.0.x 
configuration file differences</a></li></ol></li></ul>
+<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_9.0.x_to_10.0.x">Migrating from 9.0.x to 
10.0.x</a><ol><li><a href="#Java_8_required">Java 8 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_5.0_API">Servlet 5.0 API</a></li><li><a href="#Pages_3.0">Pages 
3.0</a></li><li><a href="#Expression_Language_4.0">Expression Language 
4.0</a></li><li><a href="#WebSocket_2.0">WebSocket 2.0</a></li><li><a 
href="#Authentication_4.0">Authentication 4.0</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li><li><a 
href="#web.xml_defaults">web.xml defaults</a></li><li><a 
href="#Session_management">Session management</a></li><li><a 
href="#HTTP/2">HTTP/2</a></li><li><a href="#Logging">Logging</a></li><li><a 
href="#Access_Log_Patterns">Access Log Patterns</a></li></ol></li><li><a 
href="#Upgrading_10.0.x">Upgrading 10.0.x</a><ol><li><a 
href="#Tomcat_10.0.x_noteable_changes">Tomcat 10.0.x noteable 
changes</a></li><li><a href="#
 Tomcat_10.0.x_configuration_file_differences">Tomcat 10.0.x configuration file 
differences</a></li></ol></li></ul>
 </div><h3 id="General">General</h3><div class="text">
 
 <p>Please read the general <a href="migration.html">Migration Guide page</a>
@@ -22,7 +22,7 @@ versions of Apache Tomcat<sup>&reg;</sup
   <div class="subsection"><h4 id="Specification_APIs">Specification 
APIs</h4><div class="text">
 
     <p>Apache Tomcat 10 supports the Jakarta Servlet 5.0,
-    Jakarta Server Pages 3.0, Jakarta Expression Language 4.0,
+    Jakarta Pages 3.0, Jakarta Expression Language 4.0,
     JakartaWebSocket 2.0 and Jakarta Authentication 2.0
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -54,7 +54,7 @@ versions of Apache Tomcat<sup>&reg;</sup
 
   </div></div>
 
-  <div class="subsection"><h4 id="Server_Pages_3.0">Server Pages 3.0</h4><div 
class="text">
+  <div class="subsection"><h4 id="Pages_3.0">Pages 3.0</h4><div class="text">
   
     <p>The Java package has changed from <scode>javax.servlet.jsp</scode> to
     <scode>jakarta.servlet.jsp</scode>.</p>

Modified: tomcat/site/trunk/docs/migration-11.0.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-11.0.html?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-11.0.html (original)
+++ tomcat/site/trunk/docs/migration-11.0.html Tue May 14 09:40:25 2024
@@ -1,6 +1,6 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; 
charset=UTF-8"><meta name="viewport" content="width=device-width, 
initial-scale=1"><link href="res/css/tomcat.css" rel="stylesheet" 
type="text/css"><link href="res/css/fonts/fonts.css" rel="stylesheet" 
type="text/css"><title>Apache Tomcat&reg; - Migration Guide - Tomcat 
11.0.x</title><meta name="author" content="Apache Tomcat Project"><script 
src="https://www.apachecon.com/event-images/snippet.js";></script></head><body><div
 id="wrapper"><header id="header"><div class="clearfix"><div 
class="menu-toggler pull-left" tabindex="1"><div 
class="hamburger"></div></div><a href="http://tomcat.apache.org/";><img 
class="tomcat-logo pull-left noPrint" alt="Tomcat Home" 
src="res/images/tomcat.png"></a><h1 class="pull-left">Apache 
Tomcat<sup>&reg;</sup></h1><div class="asf-logos pull-right"><a 
href="https://www.apache.org/foundation/contributing.html"; target="_blank" 
class="pull-left"><img src="https://www.apache.org/images/S
 upportApache-small.png" class="support-asf" alt="Support Apache"></a><a 
href="http://www.apache.org/"; target="_blank" class="pull-left"><img 
src="res/images/asf_logo.svg" class="asf-logo" alt="The Apache Software 
Foundation"></a></div></div></header><main id="middle"><div><div 
id="mainLeft"><div id="nav-wrapper"><form 
action="https://www.google.com/search"; method="get"><div 
class="searchbox"><input value="tomcat.apache.org" name="sitesearch" 
type="hidden"><input aria-label="Search text" placeholder="Search&hellip;" 
required="required" name="q" id="query" 
type="search"><button>GO</button></div></form><div class="asfevents"><a 
class="acevent" data-format="square" 
data-width="150"></a></div><nav><div><h2>Apache Tomcat</h2><ul><li><a 
href="./index.html">Home</a></li><li><a 
href="./taglibs.html">Taglibs</a></li><li><a href="./maven-plugin.html">Maven 
Plugin</a></li></ul></div><div><h2>Download</h2><ul><li><a 
href="./whichversion.html">Which version?</a></li><li><a href="https://tomcat.ap
 ache.org/download-11.cgi">Tomcat 11 (alpha)</a></li><li><a 
href="https://tomcat.apache.org/download-10.cgi";>Tomcat 10</a></li><li><a 
href="https://tomcat.apache.org/download-90.cgi";>Tomcat 9</a></li><li><a 
href="https://tomcat.apache.org/download-80.cgi";>Tomcat 8</a></li><li><a 
href="https://tomcat.apache.org/download-migration.cgi";>Tomcat Migration Tool 
for Jakarta EE</a></li><li><a 
href="https://tomcat.apache.org/download-connectors.cgi";>Tomcat 
Connectors</a></li><li><a 
href="https://tomcat.apache.org/download-native.cgi";>Tomcat 
Native</a></li><li><a 
href="https://tomcat.apache.org/download-taglibs.cgi";>Taglibs</a></li><li><a 
href="https://archive.apache.org/dist/tomcat/";>Archives</a></li></ul></div><div><h2>Documentation</h2><ul><li><a
 href="./tomcat-11.0-doc/index.html">Tomcat 11.0 (alpha)</a></li><li><a 
href="./tomcat-10.1-doc/index.html">Tomcat 10.1</a></li><li><a 
href="./tomcat-9.0-doc/index.html">Tomcat 9.0</a></li><li><a 
href="./tomcat-8.5-doc/index.html">Tomcat 8.5</a></li
 ><li><a href="./upgrading.html">Upgrading</a></li><li><a 
 >href="./connectors-doc/index.html">Tomcat Connectors</a></li><li><a 
 >href="./native-doc/index.html">Tomcat Native 2</a></li><li><a 
 >href="./native-1.3-doc/index.html">Tomcat Native 1.3</a></li><li><a 
 >href="./native-1.2-doc/index.html">Tomcat Native 1.2</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a></li><li><a 
 >href="./migration.html">Migration Guide</a></li><li><a 
 >href="./presentations.html">Presentations</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/x/Bi8lBg";>Specifications</a></li></ul></div><div><h2>Problems?</h2><ul><li><a
 > href="./security.html">Security Reports</a></li><li><a 
 >href="./findhelp.html">Find help</a></li><li><a 
 >href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a></li><li><a
 > href="./lists.html">Mailing Lists</a></li><li><a href="./bugreport.html">Bug 
 >Database</a></li><li><a href="./irc.html">IRC</a></li></ul></div><div><h2>Get 
 >Involved</h2><ul><li><a h
 ref="./getinvolved.html">Overview</a></li><li><a href="./source.html">Source 
code</a></li><li><a href="./ci.html">Buildbot</a></li><li><a 
href="https://cwiki.apache.org/confluence/x/vIPzBQ";>Translations</a></li><li><a 
href="./tools.html">Tools</a></li></ul></div><div><h2>Media</h2><ul><li><a 
href="https://twitter.com/theapachetomcat";>Twitter</a></li><li><a 
href="https://www.youtube.com/c/ApacheTomcatOfficial";>YouTube</a></li><li><a 
href="https://blogs.apache.org/tomcat/";>Blog</a></li></ul></div><div><h2>Misc</h2><ul><li><a
 href="./whoweare.html">Who We Are</a></li><li><a 
href="https://www.redbubble.com/people/comdev/works/30885254-apache-tomcat";>Swag</a></li><li><a
 href="./heritage.html">Heritage</a></li><li><a 
href="http://www.apache.org";>Apache Home</a></li><li><a 
href="./resources.html">Resources</a></li><li><a 
href="./contact.html">Contact</a></li><li><a 
href="./legal.html">Legal</a></li><li><a 
href="https://privacy.apache.org/policies/privacy-policy-public.html";>Privacy</a></li
 ><li><a href="https://www.apache.org/foundation/contributing.html";>Support 
 >Apache</a></li><li><a 
 >href="https://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li><li><a
 > href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li><li><a 
 >href="http://www.apache.org/licenses/";>License</a></li></ul></div></nav></div></div><div
 > id="mainRight"><div id="content"><h2 style="display: none;">Content</h2><h3 
 >id="Table_of_Contents">Table of Contents</h3><div class="text">
-<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_10.1.x_to_11.0.x">Migrating from 10.1.x to 
11.0.x</a><ol><li><a href="#Java_21_required">Java 21 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_6.1_API">Servlet 6.1 API</a></li><li><a 
href="#Server_Pages_4.0">Server Pages 4.0</a></li><li><a 
href="#Expression_Language_6.0">Expression Language 6.0</a></li><li><a 
href="#WebSocket_TBD">WebSocket TBD</a></li><li><a 
href="#Authentication_TBD">Authentication TBD</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li></ol></li><li><a 
href="#Upgrading_11.0.x">Upgrading 11.0.x</a><ol><li><a 
href="#Tomcat_11.0.x_noteable_changes">Tomcat 11.0.x noteable 
changes</a></li><li><a 
href="#Tomcat_11.0.x_configuration_file_differences">Tomcat 11.0.x 
configuration file differences</a></li></ol></li></ul>
+<ul><li><a href="#General">General</a></li><li><a 
href="#Migrating_from_10.1.x_to_11.0.x">Migrating from 10.1.x to 
11.0.x</a><ol><li><a href="#Java_21_required">Java 21 required</a></li><li><a 
href="#Specification_APIs">Specification APIs</a></li><li><a 
href="#Servlet_6.1_API">Servlet 6.1 API</a></li><li><a href="#Pages_4.0">Pages 
4.0</a></li><li><a href="#Expression_Language_6.0">Expression Language 
6.0</a></li><li><a href="#WebSocket_TBD">WebSocket TBD</a></li><li><a 
href="#Authentication_TBD">Authentication TBD</a></li><li><a 
href="#Internal_APIs">Internal APIs</a></li></ol></li><li><a 
href="#Upgrading_11.0.x">Upgrading 11.0.x</a><ol><li><a 
href="#Tomcat_11.0.x_noteable_changes">Tomcat 11.0.x noteable 
changes</a></li><li><a 
href="#Tomcat_11.0.x_configuration_file_differences">Tomcat 11.0.x 
configuration file differences</a></li></ol></li></ul>
 </div><h3 id="General">General</h3><div class="text">
 
 <p>Please read the general <a href="migration.html">Migration Guide page</a>
@@ -27,7 +27,7 @@ versions of Apache Tomcat<sup>&reg;</sup
   <div class="subsection"><h4 id="Specification_APIs">Specification 
APIs</h4><div class="text">
 
     <p>Apache Tomcat 11.0 supports the Jakarta Servlet 6.1,
-    Jakarta Server Pages 4.0, Jakarta Expression Language 6.0,
+    Jakarta Pages 4.0, Jakarta Expression Language 6.0,
     JakartaWebSocket 2.2 and Jakarta Authentication 3.1
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -40,7 +40,7 @@ versions of Apache Tomcat<sup>&reg;</sup
     
   </div></div>
 
-  <div class="subsection"><h4 id="Server_Pages_4.0">Server Pages 4.0</h4><div 
class="text">
+  <div class="subsection"><h4 id="Pages_4.0">Pages 4.0</h4><div class="text">
 
     <p>All methods and classes marked as deprecated in the 3.1 API have been
     removed.</p>

Modified: tomcat/site/trunk/docs/oldnews-2020.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2020.html?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2020.html (original)
+++ tomcat/site/trunk/docs/oldnews-2020.html Tue May 14 09:40:25 2024
@@ -932,7 +932,7 @@ to Tomcat 10 and later. A
 tool</a> is under development to aid this process.</p>
 <p>The notable changes in this release are:</p>
 <ul>
-<li>Update to Jakarta Servlet 5.0, Jakarta Server Pages 3.0. Jakarta Expression
+<li>Update to Jakarta Servlet 5.0, Jakarta Pages 3.0. Jakarta Expression
     Language 4.0, Jakarta WebSocket 2.0, Jakarta Authentication 2.0 and Jakarta
     Annotations 2.0 specifications.</li>
 <li>Use <code>&lt;request-character-encoding&gt;</code> and

Modified: tomcat/site/trunk/tools/email-template-10.1.txt
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/tools/email-template-10.1.txt?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/tools/email-template-10.1.txt (original)
+++ tomcat/site/trunk/tools/email-template-10.1.txt Tue May 14 09:40:25 2024
@@ -9,7 +9,7 @@ The Apache Tomcat team announces the imm
 Tomcat ${NEW_RELEASE}.
 
 Apache Tomcat 10 is an open source software implementation of the
-Jakarta Servlet, Jakarta Server Pages, Jakarta Expression Language,
+Jakarta Servlet, Jakarta Pages, Jakarta Expression Language,
 Jakarta WebSocket, Jakarta Authentication and Jakarta Annotations
 specifications.
 

Modified: tomcat/site/trunk/tools/email-template-11.0.txt
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/tools/email-template-11.0.txt?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/tools/email-template-11.0.txt (original)
+++ tomcat/site/trunk/tools/email-template-11.0.txt Tue May 14 09:40:25 2024
@@ -7,7 +7,7 @@ Reply-To: Tomcat Developers List <dev@to
 
 The Apache Tomcat team announces the immediate availability of Apache Tomcat 
${NEW_RELEASE} (alpha).
 
-Apache Tomcat 11 is an open source software implementation of the Jakarta 
Servlet, Jakarta Server Pages, Jakarta Expression Language, Jakarta WebSocket, 
Jakarta Authentication and Jakarta Annotations specifications.
+Apache Tomcat 11 is an open source software implementation of the Jakarta 
Servlet, Jakarta Pages, Jakarta Expression Language, Jakarta WebSocket, Jakarta 
Authentication and Jakarta Annotations specifications.
 
 Users of Tomcat 10 onwards should be aware that, as a result of the move from 
Java EE to Jakarta EE as part of the transfer of Java EE to the Eclipse 
Foundation, the primary package for all implemented APIs has changed from 
javax.* to jakarta.*. This will almost certainly require code changes to enable 
applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later. A 
migration tool is available to aid this process.
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue May 14 09:40:25 2024
@@ -18,7 +18,7 @@ of the
 <a href="https://projects.eclipse.org/projects/ee4j.servlet";
 rel="nofollow">Jakarta Servlet</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.jsp";
-rel="nofollow">Jakarta Server Pages</a>,
+rel="nofollow">Jakarta Pages</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.el";
 rel="nofollow">Jakarta Expression Language</a>,
 <a href="https://projects.eclipse.org/projects/ee4j.websocket";

Modified: tomcat/site/trunk/xdocs/migration-10.1.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.1.xml?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-10.1.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.1.xml Tue May 14 09:40:25 2024
@@ -35,7 +35,7 @@ versions of Apache Tomcat<sup>&#174;</su
   <subsection name="Specification APIs">
 
     <p>Apache Tomcat 10.1 supports the Jakarta Servlet 6.0,
-    Jakarta Server Pages 3.1, Jakarta Expression Language 5.0,
+    Jakarta Pages 3.1, Jakarta Expression Language 5.0,
     JakartaWebSocket 2.1 and Jakarta Authentication 3.0
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -60,7 +60,7 @@ versions of Apache Tomcat<sup>&#174;</su
 
   </subsection>
 
-  <subsection name="Server Pages 3.1">
+  <subsection name="Pages 3.1">
 
     <p>Added an option to raise a <code>PropertyNotFoundException</code> when 
an
     EL expression contains an unknown identifier.</p>

Modified: tomcat/site/trunk/xdocs/migration-10.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-10.xml?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-10.xml (original)
+++ tomcat/site/trunk/xdocs/migration-10.xml Tue May 14 09:40:25 2024
@@ -35,7 +35,7 @@ versions of Apache Tomcat<sup>&#174;</su
   <subsection name="Specification APIs">
 
     <p>Apache Tomcat 10 supports the Jakarta Servlet 5.0,
-    Jakarta Server Pages 3.0, Jakarta Expression Language 4.0,
+    Jakarta Pages 3.0, Jakarta Expression Language 4.0,
     JakartaWebSocket 2.0 and Jakarta Authentication 2.0
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -67,7 +67,7 @@ versions of Apache Tomcat<sup>&#174;</su
 
   </subsection>
 
-  <subsection name="Server Pages 3.0">
+  <subsection name="Pages 3.0">
   
     <p>The Java package has changed from <scode>javax.servlet.jsp</scode> to
     <scode>jakarta.servlet.jsp</scode>.</p>

Modified: tomcat/site/trunk/xdocs/migration-11.0.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-11.0.xml?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-11.0.xml (original)
+++ tomcat/site/trunk/xdocs/migration-11.0.xml Tue May 14 09:40:25 2024
@@ -40,7 +40,7 @@ versions of Apache Tomcat<sup>&#174;</su
   <subsection name="Specification APIs">
 
     <p>Apache Tomcat 11.0 supports the Jakarta Servlet 6.1,
-    Jakarta Server Pages 4.0, Jakarta Expression Language 6.0,
+    Jakarta Pages 4.0, Jakarta Expression Language 6.0,
     JakartaWebSocket 2.2 and Jakarta Authentication 3.1
     <a 
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>.
     </p>
@@ -53,7 +53,7 @@ versions of Apache Tomcat<sup>&#174;</su
     
   </subsection>
 
-  <subsection name="Server Pages 4.0">
+  <subsection name="Pages 4.0">
 
     <p>All methods and classes marked as deprecated in the 3.1 API have been
     removed.</p>

Modified: tomcat/site/trunk/xdocs/oldnews-2020.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2020.xml?rev=1917717&r1=1917716&r2=1917717&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews-2020.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2020.xml Tue May 14 09:40:25 2024
@@ -1015,7 +1015,7 @@ to Tomcat 10 and later. A
 tool</a> is under development to aid this process.</p>
 <p>The notable changes in this release are:</p>
 <ul>
-<li>Update to Jakarta Servlet 5.0, Jakarta Server Pages 3.0. Jakarta Expression
+<li>Update to Jakarta Servlet 5.0, Jakarta Pages 3.0. Jakarta Expression
     Language 4.0, Jakarta WebSocket 2.0, Jakarta Authentication 2.0 and Jakarta
     Annotations 2.0 specifications.</li>
 <li>Use <code>&lt;request-character-encoding&gt;</code> and



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org


Reply via email to