From 33486bc668266fa0d9620d72437a951707512fcf Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Mon, 13 Apr 2026 16:51:55 +0100 Subject: [PATCH 1/5] JSP -> Jakarta Pages Phase 1 - top level module --- NOTICE.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 67ef6bf5..51c68046 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -49,9 +49,3 @@ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted. - -## Note - -References in this document to JSP refer to the Jakarta Pages unless otherwise -noted. - From 3f783b7a276423c8216dc7cf0cbbd6e108d46ca4 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 14 Apr 2026 11:28:59 +0100 Subject: [PATCH 2/5] "JSP" -> "Jakarta Pages" - Phase 1 - api module --- api/pom.xml | 2 +- .../java/jakarta/servlet/jsp/ErrorData.java | 8 +- .../java/jakarta/servlet/jsp/HttpJspPage.java | 16 +-- .../servlet/jsp/JspApplicationContext.java | 18 +-- .../java/jakarta/servlet/jsp/JspContext.java | 6 +- .../jakarta/servlet/jsp/JspEngineInfo.java | 4 +- .../jakarta/servlet/jsp/JspException.java | 4 +- .../java/jakarta/servlet/jsp/JspFactory.java | 24 ++-- .../java/jakarta/servlet/jsp/JspPage.java | 28 ++-- .../jakarta/servlet/jsp/JspTagException.java | 14 +- .../java/jakarta/servlet/jsp/JspWriter.java | 14 +- .../java/jakarta/servlet/jsp/PageContext.java | 50 +++---- .../servlet/jsp/SkipPageException.java | 4 +- .../jsp/el/ImplicitObjectELResolver.java | 16 +-- .../servlet/jsp/el/ImportELResolver.java | 2 +- .../servlet/jsp/el/NotFoundELResolver.java | 2 +- .../jakarta/servlet/jsp/tagext/BodyTag.java | 14 +- .../servlet/jsp/tagext/BodyTagSupport.java | 2 +- .../servlet/jsp/tagext/IterationTag.java | 6 +- .../servlet/jsp/tagext/JspFragment.java | 8 +- .../servlet/jsp/tagext/JspIdConsumer.java | 10 +- .../jakarta/servlet/jsp/tagext/PageData.java | 8 +- .../jakarta/servlet/jsp/tagext/SimpleTag.java | 8 +- .../servlet/jsp/tagext/SimpleTagSupport.java | 6 +- .../java/jakarta/servlet/jsp/tagext/Tag.java | 22 +-- .../servlet/jsp/tagext/TagAdapter.java | 4 +- .../servlet/jsp/tagext/TagAttributeInfo.java | 10 +- .../servlet/jsp/tagext/TagExtraInfo.java | 8 +- .../servlet/jsp/tagext/TagFileInfo.java | 2 +- .../jakarta/servlet/jsp/tagext/TagInfo.java | 18 +-- .../servlet/jsp/tagext/TagLibraryInfo.java | 6 +- .../jsp/tagext/TagLibraryValidator.java | 12 +- .../servlet/jsp/tagext/TagSupport.java | 4 +- .../servlet/jsp/tagext/ValidationMessage.java | 6 +- .../servlet/jsp/tagext/VariableInfo.java | 14 +- .../jakarta/servlet/jsp/el/package.html | 10 +- .../javadoc/jakarta/servlet/jsp/package.html | 31 ++--- .../jakarta/servlet/jsp/tagext/package.html | 129 +++++++++--------- 38 files changed, 266 insertions(+), 284 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 506a118d..d9ebd135 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -57,7 +57,7 @@ - JSP dev mailing list + Jakarta Pages (JSP) dev mailing list jsp-dev@eclipse.org https://accounts.eclipse.org/mailing-list/jsp-dev https://accounts.eclipse.org/mailing-list/jsp-dev diff --git a/api/src/main/java/jakarta/servlet/jsp/ErrorData.java b/api/src/main/java/jakarta/servlet/jsp/ErrorData.java index 393a1937..599e8ee3 100644 --- a/api/src/main/java/jakarta/servlet/jsp/ErrorData.java +++ b/api/src/main/java/jakarta/servlet/jsp/ErrorData.java @@ -20,7 +20,7 @@ /** * Contains information about an error, for error pages. The information contained in this instance is meaningless if - * not used in the context of an error page. To indicate a JSP is an error page, the page author must set the + * not used in the context of an error page. To indicate a page is an error page, the page author must set the * isErrorPage attribute of the page directive to "true". * * @see PageContext#getErrorData @@ -60,7 +60,7 @@ public ErrorData(Throwable throwable, int statusCode, String uri, String servlet * @param servletName The name of the servlet invoked * @param queryString The request query string * - * @since JSP 4.0 + * @since Pages (JSP) 4.0 */ public ErrorData(Throwable throwable, int statusCode, String method, String uri, String servletName, String queryString) { @@ -95,7 +95,7 @@ public int getStatusCode() { * * @return The request method * - * @since JSP 4.0 + * @since Pages (JSP) 4.0 */ public String getMethod() { return this.method; @@ -125,7 +125,7 @@ public String getServletName() { * * @return The request query string * - * @since JSP 4.0 + * @since Pages (JSP) 4.0 */ public String getQueryString() { return this.queryString; diff --git a/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java b/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java index 46e41c84..1eb7d135 100644 --- a/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java +++ b/api/src/main/java/jakarta/servlet/jsp/HttpJspPage.java @@ -23,28 +23,28 @@ import jakarta.servlet.ServletException; /** - * The HttpJspPage interface describes the interaction that a JSP Page Implementation Class must satisfy when using the + * The HttpJspPage interface describes the interaction that a Jakarta Pages (JSP) Page Implementation Class must satisfy when using the * HTTP protocol. * *

* The behaviour is identical to that of the JspPage, except for the signature of the _jspService method, which is now * expressible in the Java type system and included explicitly in the interface. - * + * * @see JspPage */ public interface HttpJspPage extends JspPage { /** - * The _jspService()method corresponds to the body of the JSP page. This method is defined automatically by the JSP - * container and should never be defined by the JSP page author. + * The _jspService()method corresponds to the body of the page. This method is defined automatically by the Jakarta Pages (JSP) + * container and should never be defined by the page author. *

* If a superclass is specified using the extends attribute, that superclass may choose to perform some actions in * its service() method before or after calling the _jspService() method. See using the extends attribute in the - * JSP_Engine chapter of the JSP specification. + * Jakarta Pages (JSP) Container chapter of the Jakarta Pages (JSP) specification. * - * @param request Provides client request information to the JSP. - * @param response Assists the JSP in sending a response to the client. - * @throws ServletException Thrown if an error occurred during the processing of the JSP and that the container + * @param request Provides client request information to the page. + * @param response Assists the page in sending a response to the client. + * @throws ServletException Thrown if an error occurred during the processing of the page and that the container * should take appropriate action to clean up the request. * @throws IOException Thrown if an error occurred while writing the response for this page. */ diff --git a/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java b/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java index 506e1325..1e6572f0 100644 --- a/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java +++ b/api/src/main/java/jakarta/servlet/jsp/JspApplicationContext.java @@ -23,10 +23,10 @@ import jakarta.el.ELContextListener; /** - * Stores application-scoped information relevant to JSP containers. + * Stores application-scoped information relevant to Jakarta Pages (JSP) containers. * *

- * The JSP container must create a single instance of JspApplicationContext for each + * The Jakarta Pages (JSP) container must create a single instance of JspApplicationContext for each * ServletContext instance. *

* @@ -37,13 +37,13 @@ *

* *

- * The JspApplicationContext provides the following services to JSP applications: + * The JspApplicationContext provides the following services to Jakarta Pages (JSP) applications: *

*