This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 7cf3561 Some more Java EE 8 to Jakarta EE 9 updates
7cf3561 is described below
commit 7cf356168e018271271dc0fce2ed924cfc124dc1
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 25 16:47:41 2021 +0100
Some more Java EE 8 to Jakarta EE 9 updates
---
webapps/docs/appdev/deployment.xml | 4 ++--
webapps/docs/appdev/introduction.xml | 20 +++++++----------
webapps/docs/appdev/sample/web/WEB-INF/web.xml | 8 +++----
webapps/docs/index.xml | 30 +++++++++++++-------------
4 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/webapps/docs/appdev/deployment.xml
b/webapps/docs/appdev/deployment.xml
index 06349f5..38b349d 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -136,8 +136,8 @@ drivers that are required for both your application or
internal Tomcat use
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 4.0</em> and <em>JSP 2.3</em> APIs that are fundamental
- to writing servlets and JavaServer Pages.<br/><br/></li>
+<li>The <em>Servlet 5.0</em> and <em>JSP 3.0</em> APIs that are fundamental
+ to writing servlets and JSPs.<br/><br/></li>
</ul>
</section>
diff --git a/webapps/docs/appdev/introduction.xml
b/webapps/docs/appdev/introduction.xml
index 76995cc..875f3a1 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -62,27 +62,23 @@ the details of your particular environment.</p>
information, documentation, and software that is useful in developing
web applications with Tomcat.</p>
<ul>
-<li><p><a
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html</a>
-
- <i>JavaServer Pages (JSP) Specification, Version 2.3</i>. Describes
+<li><p><a
href="https://jakarta.ee/specifications/pages/3.0/";>https://jakarta.ee/specifications/pages/3.0/</a>
-
+ <i>Jakarta Server Pages (JSP), Version 3.0</i>. Describes
the programming environment provided by standard implementations
- of the JavaServer Pages (JSP) technology. In conjunction with
+ of the Jakarta Server Pages technology. In conjunction with
the Servlet API Specification (see below), this document describes
- what a portable API page is allowed to contain. Specific
+ what a portable JSP page is allowed to contain. Specific
information on scripting (Chapter 9), tag extensions (Chapter 7),
- and packaging JSP pages (Appendix A) is useful. The Javadoc
- API Documentation is included in the specification, and with the
- Tomcat download.</p></li>
-<li><p><a
href="https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html";>https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html</a>
-
- <i>Servlet API Specification, Version 4.0</i>. Describes the
+ and packaging JSP pages (Appendix A) is useful..</p></li>
+<li><p><a
href="https://jakarta.ee/specifications/servlet/5.0/";>https://jakarta.ee/specifications/servlet/5.0/</a>
-
+ <i>Jakarta Servlet API Specification, Version 5.0</i>. Describes the
programming environment that must be provided by all servlet
containers conforming to this specification. In particular, you
will need this document to understand the web application
directory structure and deployment file (Chapter 10), methods of
mapping request URIs to servlets (Chapter 12), container managed
security (Chapter 13), and the syntax of the <code>web.xml</code>
- Web Application Deployment Descriptor (Chapter 14). The Javadoc
- API Documentation is included in the specification, and with the
- Tomcat download.</p></li>
+ Web Application Deployment Descriptor (Chapter 14).</p></li>
</ul>
</section>
diff --git a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index 8502f99..717c137 100644
--- a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -15,11 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd";
+ version="5.0">
<display-name>Hello, World Application</display-name>
<description>
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 317fd32..cfa893f 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -164,34 +164,34 @@ are responsible for installing, configuring, and
operating an Apache Tomcat serv
- Complete documentation and HOWTOs on the JK native webserver connector,
used to interface Apache Tomcat with servers like Apache HTTPd, IIS
and others.</li>
-<li>Servlet 4.0
- <a
href="https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html";>
+<li>Servlet 5.0
+ <a href="https://jakarta.ee/specifications/servlet/5.0/";>
<strong>Specification</strong></a> and
- <a
href="https://javaee.github.io/javaee-spec/javadocs/javax/servlet/package-summary.html";>
+ <a href="https://jakarta.ee/specifications/servlet/5.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>JSP 2.3
- <a
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>
+<li>JSP 3.0
+ <a href="https://jakarta.ee/specifications/pages/3.0/";>
<strong>Specification</strong></a> and
- <a
href="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/package-summary.html";>
+ <a href="https://jakarta.ee/specifications/pages/3.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>EL 3.0
- <a
href="https://jcp.org/aboutJava/communityprocess/final/jsr341/index.html";>
+<li>EL 4.0
+ <a href="https://jakarta.ee/specifications/expression-language/4.0/";>
<strong>Specification</strong></a> and
- <a
href="http://docs.oracle.com/javaee/7/api/javax/el/package-summary.html";>
+ <a
href="https://jakarta.ee/specifications/expression-language/4.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>WebSocket 1.1
- <a
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr356/index.html";>
+<li>WebSocket 2.0
+ <a href="https://jakarta.ee/specifications/websocket/2.0/";>
<strong>Specification</strong></a> and
- <a
href="http://docs.oracle.com/javaee/7/api/javax/websocket/package-summary.html";>
+ <a href="https://jakarta.ee/specifications/websocket/2.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
-<li>JASPIC 1.1
- <a
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr196/index.html";>
+<li>Authentication 2.0
+ <a href="https://jakarta.ee/specifications/authentication/2.0/";>
<strong>Specification</strong></a> and
- <a
href="http://docs.oracle.com/javaee/7/api/javax/security/auth/message/package-summary.html";>
+ <a href="https://jakarta.ee/specifications/authentication/2.0/apidocs";>
<strong>Javadoc</strong></a>
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
