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. - 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: *

*