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 d5782bd5f1 'Jakarta Server Pages' -> 'Jakarta Pages' d5782bd5f1 is described below commit d5782bd5f1fd3fc5587c32e99ed8941f6e81a465 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue May 14 10:44:21 2024 +0100 'Jakarta Server Pages' -> 'Jakarta Pages' --- java/jakarta/servlet/jsp/el/ImportELResolver.java | 2 +- java/jakarta/servlet/jsp/el/NotFoundELResolver.java | 2 +- java/jakarta/servlet/jsp/tagext/package.html | 6 +++--- res/META-INF/jsp-api.jar.manifest | 2 +- res/bnd/jsp-api.jar.tmp.bnd | 2 +- res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 2 +- webapps/docs/appdev/introduction.xml | 4 ++-- webapps/docs/index.xml | 2 +- webapps/docs/jasper-howto.xml | 2 +- webapps/examples/jsp/index.html | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java/jakarta/servlet/jsp/el/ImportELResolver.java b/java/jakarta/servlet/jsp/el/ImportELResolver.java index 9f54d6dcea..57a6c386ed 100644 --- a/java/jakarta/servlet/jsp/el/ImportELResolver.java +++ b/java/jakarta/servlet/jsp/el/ImportELResolver.java @@ -24,7 +24,7 @@ import jakarta.el.ELResolver; import jakarta.el.ImportHandler; /** - * Providers resolution of imports and static imports in the Jakarta Server Pages ELResolver chain. + * Providers resolution of imports and static imports in the Jakarta Pages ELResolver chain. * * @since JSP 3.1 */ diff --git a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java index e39b6dbd41..bfe58d1b80 100644 --- a/java/jakarta/servlet/jsp/el/NotFoundELResolver.java +++ b/java/jakarta/servlet/jsp/el/NotFoundELResolver.java @@ -24,7 +24,7 @@ import jakarta.el.ELResolver; import jakarta.el.PropertyNotFoundException; /** - * The final resolver of the Jakarta Server Pages ELResolver chain. It always resolves the requested value, returning + * The final resolver of the Jakarta Pages ELResolver chain. It always resolves the requested value, returning * {@code null} when it does so. * * @since JSP 3.1 diff --git a/java/jakarta/servlet/jsp/tagext/package.html b/java/jakarta/servlet/jsp/tagext/package.html index 51bad0a164..5ee762888b 100644 --- a/java/jakarta/servlet/jsp/tagext/package.html +++ b/java/jakarta/servlet/jsp/tagext/package.html @@ -20,11 +20,11 @@ </head> <body bgcolor="white"> -Classes and interfaces for the definition of JavaServer Pages Tag Libraries. +Classes and interfaces for the definition of Jakarta Pages Tag Libraries. <p> -The JavaServer Pages(tm) (JSP) 2.0 specification provides a portable -mechanism for the description of tag libraries. +The Jakarta Pages specification provides a portable mechanism for the +description of tag libraries. <p> A JSP tag library contains <ul> diff --git a/res/META-INF/jsp-api.jar.manifest b/res/META-INF/jsp-api.jar.manifest index da97c0687c..e62888437b 100644 --- a/res/META-INF/jsp-api.jar.manifest +++ b/res/META-INF/jsp-api.jar.manifest @@ -3,7 +3,7 @@ X-Compile-Source-JDK: @source.jdk@ X-Compile-Target-JDK: @target.jdk@ Name: jakarta/servlet/jsp/ -Specification-Title: Jakarta Server Pages +Specification-Title: Jakarta Pages Specification-Version: @jsp.spec.version@ Specification-Vendor: Eclipse Foundation Implementation-Title: jakarta.servlet.jsp diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd index 8d7e5fc52a..e6d1152c91 100644 --- a/res/bnd/jsp-api.jar.tmp.bnd +++ b/res/bnd/jsp-api.jar.tmp.bnd @@ -27,7 +27,7 @@ Provide-Capability: \ uses:='${packages;NAMED;jakarta.servlet.jsp.*}' -namesection: jakarta/servlet/jsp*/;\ - Specification-Title=Jakarta Server Pages;\ + Specification-Title=Jakarta Pages;\ Specification-Version=${jsp.spec.version};\ Specification-Vendor=Eclipse Foundation;\ Implementation-Title=jakarta.servlet.jsp;\ diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd index ca0953ec17..195eafb30e 100644 --- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd +++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd @@ -44,7 +44,7 @@ Provide-Capability: \ uses:='${packages;NAMED;jakarta.servlet.jsp.*}' -namesection: jakarta/servlet/jsp*/;\ - Specification-Title=Jakarta Server Pages;\ + Specification-Title=Jakarta Pages;\ Specification-Version=${jsp.spec.version};\ Specification-Vendor=Eclipse Foundation;\ Implementation-Title=jakarta.servlet.jsp;\ diff --git a/webapps/docs/appdev/introduction.xml b/webapps/docs/appdev/introduction.xml index ee856d1fbe..b2cffff4ef 100644 --- a/webapps/docs/appdev/introduction.xml +++ b/webapps/docs/appdev/introduction.xml @@ -63,9 +63,9 @@ information, documentation, and software that is useful in developing web applications with Tomcat.</p> <ul> <li><p><a href="https://jakarta.ee/specifications/pages/4.0/">https://jakarta.ee/specifications/pages/4.0/</a> - - <i>Jakarta Server Pages (JSP), Version 4.0</i>. Describes + <i>Jakarta Pages (JSP), Version 4.0</i>. Describes the programming environment provided by standard implementations - of the Jakarta Server Pages technology. In conjunction with + of the Jakarta Pages technology. In conjunction with the Servlet API Specification (see below), this document describes what a portable JSP page is allowed to contain. Specific information on scripting (Chapter 9), tag extensions (Chapter 7), diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml index e41a1b2649..cba8260247 100644 --- a/webapps/docs/index.xml +++ b/webapps/docs/index.xml @@ -35,7 +35,7 @@ <p>This is the top-level entry point of the documentation bundle for the <strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version -<version-major-minor/> implements the Servlet 6.0 and JavaServer Pages 4.0 +<version-major-minor/> implements the Servlet 6.0 and Pages 4.0 <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications">specifications</a> from <a href="https://jakarta.ee/">Jakarta EE</a>, and includes many additional features that make it a useful platform for developing and deploying diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index ac73faafea..e0d35f7911 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -37,7 +37,7 @@ <section name="Introduction"> <p>Tomcat <version-major-minor/> uses the Jasper 2 JSP Engine to implement -the <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications">JavaServer Pages 2.3</a> +the <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications">Jakarta Pages 4.0</a> specification.</p> <p>Jasper 2 has been redesigned to significantly improve performance over diff --git a/webapps/examples/jsp/index.html b/webapps/examples/jsp/index.html index b2371207cf..3d5ee31c02 100644 --- a/webapps/examples/jsp/index.html +++ b/webapps/examples/jsp/index.html @@ -29,7 +29,7 @@ <h1>JSP Samples</h1> <p>This is a collection of samples demonstrating the usage of different -parts of the Java Server Pages (JSP) specification. Both JSP 2.0 and +parts of the Jakarta Pages (JSP) specification. Both JSP 2.0 and JSP 1.2 examples are presented below. <p>These examples will only work when these pages are being served by a servlet engine; of course, we recommend --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org