WFLY-14321 Replace 'JavaServer Pages|JSP' references in java doc with…

… corresponding Jakarta EE ones

docs/src/main/asciidoc/Getting_Started_Guide.adoc

@@ -46,7 +46,7 @@ Profile |WildFly {wildflyVersion} Full Platform |WildFly {wildflyVersion} Web Pr
 
 |Jakarta Expression Language 3.0 |X |X |X |X
 
-|JSR-245: JavaServer Pages 2.3 |X |X |X |X
+|Jakarta Server Pages 2.3 |X |X |X |X
 
 |Jakarta Standard Tag Library 1.2 |X |X |X
 |X

docs/src/main/asciidoc/_admin-guide/subsystem-configuration/Undertow.adoc

@@ -344,8 +344,8 @@ point to the resource being forwarded to.
 
 |=======================================================================
 
-[[jsp-configuration]]
-=== JSP configuration
+[[Jakarta-Server-Pages-configuration]]
+=== Jakarta Server Pages configuration
 
 [[session-cookie-configuration]]
 === Session Cookie Configuration
@@ -387,4 +387,4 @@ include::Undertow_AJP_listeners.adoc[]
 
 include::Undertow_using_as_a_Load_Balancer.adoc[]
 
-:leveloffset: -1
+:leveloffset: -1

docs/src/main/asciidoc/_high-availability/Clustering_and_Domain_Setup_Walkthrough.adoc

@@ -823,3 +823,5 @@ https://community.jboss.org/people/jfclere[Jean-Frederic Clere] provided
 the mod_cluster 1.2.0 usages. +
 Misty Stanley-Jones has given a lot of suggestions and helps to make
 this document readable.
+
+NOTE: References in this document to JavaServer Pages(JSP) refer to the Jakarta Server Pages unless otherwise noted

ee/src/main/java/org/jboss/as/ee/component/ReflectiveClassIntrospector.java

@@ -40,7 +40,7 @@ public ReflectiveClassIntrospector() {
     @Override
     public ManagedReferenceFactory createFactory(final Class<?> clazz) {
         if (WildFlySecurityManager.isChecking()) {
-            // Execute in a privileged block for executions, such as JSP's, that do not copy the security
+            // Execute in a privileged block for executions, such as Jakarta Server Pages, that do not copy the security
             // context/protection domains onto class loaders. The permission check is done on the constructor.
             return AccessController.doPrivileged(new PrivilegedAction<ManagedReferenceFactory>() {
                 @Override

legacy/web/src/test/java/org/jboss/as/web/test/WebMigrateTestCase.java

@@ -231,7 +231,7 @@ public void testMigrateOperation() throws Exception {
         assertEquals("${prop.default-session-timeout:30}", servletContainer.get(Constants.DEFAULT_SESSION_TIMEOUT).asString());
         assertEquals("${prop.listings:true}", servletContainer.get(Constants.DIRECTORY_LISTING).asString());
 
-        //jsp settings
+        //Jakarta Server Pages settings
         ModelNode jsp = servletContainer.get(Constants.SETTING, Constants.JSP);
         assertNotNull(jsp);
         assertEquals("${prop.recompile-on-fail:true}", jsp.get(Constants.RECOMPILE_ON_FAIL).asString());

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/servlet/web-ear.xml

@@ -11,7 +11,7 @@
       <servlet-class>org.jboss.as.test.integration.ejb.servlet.EJBServletEar</servlet-class>
    </servlet>
 
-   <!-- The servlet and jsp page mappings -->
+   <!-- The servlet and Jakarta Server Pages page mappings -->
    <servlet-mapping>
       <servlet-name>EJBServlet</servlet-name>
       <url-pattern>/EJBServlet</url-pattern>

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/servlet/web.xml

@@ -11,7 +11,7 @@
       <servlet-class>org.jboss.as.test.integration.ejb.servlet.EJBServlet</servlet-class>
    </servlet>
 
-   <!-- The servlet and jsp page mappings -->
+   <!-- The servlet and Jakarta Server Pages page mappings -->
    <servlet-mapping>
       <servlet-name>EJBServlet</servlet-name>
       <url-pattern>/EJBServlet</url-pattern>

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/testurl/web.xml

@@ -37,7 +37,7 @@
    <!-- 
       FacesServlet is main servlet responsible to handle all request. 
       It acts as central controller.
-      This servlet initializes the JSF components before the JSP is displayed.
+      This servlet initializes the Jakarta Server Faces components before the Jakarta Server Pages page is displayed.
    -->
 
    <servlet>

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/DeploymentOverlayCLITestCase.java

@@ -60,6 +60,9 @@
 
 /**
  * @author Alexey Loubyansky
+ *
+ * NOTE: References in this file to JavaServer Pages(JSP) refer to the Jakarta Server Pages unless otherwise noted
+ *
  */
 @RunWith(Arquillian.class)
 @RunAsClient

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/a-replaced.jsp

@@ -1 +1 @@
-Replaced JSP File
+Replaced JSP File

testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/a.jsp

@@ -1 +1 @@
-Original JSP File
+Original JSP File

testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/ForwardJSPTestCase.java

@@ -38,7 +38,7 @@
 import static org.junit.Assert.assertTrue;
 
 /**
- * Test that the servlet should be able to forward jsp resource within same deployment.
+ * Test that the servlet should be able to forward Jakarta Server Pages resource within same deployment.
  *
  * @author Lin Gao
  */

testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/formauth/resources/web.xml

@@ -19,7 +19,7 @@
         <servlet-class>org.jboss.as.test.integration.web.formauth.LogoutServlet</servlet-class>
     </servlet>
 
-    <!-- The servlet and jsp page mappings -->
+    <!-- The servlet and Jakarta Server Pages page mappings -->
     <servlet-mapping>
         <servlet-name>SecureServlet</servlet-name>
         <url-pattern>/restricted/SecuredServlet</url-pattern>

testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/jsp/JspMappingTestCase.java

@@ -46,7 +46,7 @@
 import org.junit.runner.RunWith;
 
 /**
- * Test case for JSP pattern declaration in web.xml
+ * Test case for Jakarta Server Pages pattern declaration in web.xml
  *
  * @author <a href="mailto:ehugonne@redhat.com">Emmanuel Hugonnet</a> (c) 2014
  * Red Hat, inc.

testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/jsp/taglib/jar/TagLibInJarTestCase.java

@@ -110,7 +110,7 @@ public void testTldInsideResourcesFolder() throws Exception {
 
     /**
      * Tests if deployment with taglib-location pointing to jar fails during deployment phase.
-     * Test passes if the correct response is returned from the JSP.
+     * Test passes if the correct response is returned from the Jakarta Server Pages.
      *
      * @throws Exception
      */

undertow/src/main/java/org/wildfly/extension/undertow/Constants.java

@@ -73,7 +73,7 @@ public interface Constants {
     String SCHEME = "scheme";
     String MAX_POST_SIZE = "max-post-size";
     String DEFAULT_RESPONSE_CODE = "default-response-code";
-    /*JSP config */
+    /*Jakarta Server Pages config */
     String CHECK_INTERVAL = "check-interval";
     String CONTAINER = "container";
     String DEVELOPMENT = "development";

undertow/src/main/java/org/wildfly/extension/undertow/deployment/UndertowDeploymentInfoService.java

@@ -624,7 +624,7 @@ private DeploymentInfo createServletConfig() throws StartException {
             JSPConfig jspConfig = servletContainer.getJspConfig();
             final Set<String> seenMappings = new HashSet<>();
 
-            //default JSP servlet
+            //default Jakarta Server Pages servlet
             final ServletInfo jspServlet = jspConfig != null ? jspConfig.createJSPServletInfo() : null;
             if (jspServlet != null) { //this would be null if jsp support is disabled
                 HashMap<String, JspPropertyGroup> propertyGroups = createJspConfig(mergedMetaData);
@@ -644,7 +644,7 @@ private DeploymentInfo createServletConfig() throws StartException {
                     }
                 }
                 seenMappings.addAll(jspPropertyGroupMappings);
-                //setup JSP application context initializing listener
+                //setup Jakarta Server Pages application context initializing listener
                 d.addListener(new ListenerInfo(JspInitializationListener.class));
                 d.addServletContextAttribute(JspInitializationListener.CONTEXT_KEY, expressionFactoryWrappers);
             }
@@ -1128,10 +1128,10 @@ private static io.undertow.servlet.api.TransportGuaranteeType transportGuarantee
 
     private static HashMap<String, JspPropertyGroup> createJspConfig(JBossWebMetaData metaData) {
         final HashMap<String, JspPropertyGroup> result = new HashMap<>();
-        // JSP Config
+        // Jakarta Server Pages Config
         JspConfigMetaData config = metaData.getJspConfig();
         if (config != null) {
-            // JSP Property groups
+            // Jakarta Server Pages Property groups
             List<JspPropertyGroupMetaData> groups = config.getPropertyGroups();
             if (groups != null) {
                 for (JspPropertyGroupMetaData group : groups) {

undertow/src/main/java/org/wildfly/extension/undertow/deployment/UndertowJSPInstanceManager.java

@@ -36,7 +36,7 @@
  *
  *
  * We don't use web injection container for instances of org.apache.jasper.runtime.HttpJspBase, as it causes problems
- * with JSP hot reload. Because a new JSP class has the same name the generated ID is exactly the same.
+ * with Jakarta Server Pages hot reload. Because a new Jakarta Server Pages class has the same name the generated ID is exactly the same.
  *
  *
  * @author Stuart Douglas

undertow/src/main/java/org/wildfly/extension/undertow/logging/UndertowLogger.java

@@ -65,7 +65,7 @@ public interface UndertowLogger extends BasicLogger {
      */
 
     @LogMessage(level = Logger.Level.ERROR)
-    @Message(id = 1, value = "Could not initialize JSP")
+    @Message(id = 1, value = "Could not initialize Jakarta Server Pages")
     void couldNotInitJsp(@Cause ClassNotFoundException e);
 
     // @LogMessage(level = ERROR)

undertow/src/main/resources/org/wildfly/extension/undertow/LocalDescriptions.properties

@@ -285,18 +285,18 @@ undertow.host.setting=Settings
 undertow.host.default-response-code=If set, this will be response code sent back in case requested context does not exist on server.
 undertow.host.disable-console-redirect=if set to true, /console redirect wont be enabled for this host, default is false
 undertow.host.queue-requests-on-start=If requests should be queued on start for this host. If this is set to false the default response code will be returned instead.
-undertow.setting.jsp=JSP container configuration.
-undertow.setting.jsp.add=Adds JSP container configuration.
-undertow.setting.jsp.remove=Removes JSP container configuration.
-undertow.setting.jsp.development=Enable Development mode which enables reloading JSP on-the-fly
-undertow.setting.jsp.disabled=Disable the JSP container.
+undertow.setting.jsp=Jakarta Server Pages container configuration.
+undertow.setting.jsp.add=Adds Jakarta Server Pages container configuration.
+undertow.setting.jsp.remove=Removes Jakarta Server Pages container configuration.
+undertow.setting.jsp.development=Enable Development mode which enables reloading Jakarta Server Pages on-the-fly
+undertow.setting.jsp.disabled=Disable the Jakarta Server Pages container.
 undertow.setting.jsp.keep-generated=Keep the generated Servlets.
 undertow.setting.jsp.trim-spaces=Trim some spaces from the generated Servlet.
 undertow.setting.jsp.tag-pooling=Enable tag pooling.
-undertow.setting.jsp.mapped-file=Map to the JSP source.
-undertow.setting.jsp.check-interval=Check interval for JSP updates using a background thread. This has no effect for most deployments where JSP change notifications are handled using the File System notification API. This only takes effect if the file watch service is disabled.
+undertow.setting.jsp.mapped-file=Map to the Jakarta Server Pages source.
+undertow.setting.jsp.check-interval=Check interval for Jakarta Server Pages updates using a background thread. This has no effect for most deployments where Jakarta Server Pages change notifications are handled using the File System notification API. This only takes effect if the file watch service is disabled.
 undertow.setting.jsp.modification-test-interval=Minimum amount of time between two tests for updates, in seconds.
-undertow.setting.jsp.recompile-on-fail=Retry failed JSP compilations on each request.
+undertow.setting.jsp.recompile-on-fail=Retry failed Jakarta Server Pages compilations on each request.
 undertow.setting.jsp.smap=Enable SMAP.
 undertow.setting.jsp.dump-smap=Write SMAP data to a file.
 undertow.setting.jsp.generate-strings-as-char-arrays=Generate String constants as char arrays.
@@ -305,9 +305,9 @@ undertow.setting.jsp.scratch-dir=Specify a different work directory.
 undertow.setting.jsp.source-vm=Source VM level for compilation.
 undertow.setting.jsp.target-vm=Target VM level for compilation.
 undertow.setting.jsp.java-encoding=Specify the encoding used for Java sources.
-undertow.setting.jsp.x-powered-by=Enable advertising the JSP engine in x-powered-by.
-undertow.setting.jsp.display-source-fragment=When a runtime error occurs, attempts to display corresponding JSP source fragment
-undertow.setting.jsp.optimize-scriptlets=If JSP scriptlets should be optimised to remove string concatenation
+undertow.setting.jsp.x-powered-by=Enable advertising the Jakarta Server Pages engine in x-powered-by.
+undertow.setting.jsp.display-source-fragment=When a runtime error occurs, attempts to display corresponding Jakarta Server Pages source fragment
+undertow.setting.jsp.optimize-scriptlets=If Jakarta Server Pages scriptlets should be optimised to remove string concatenation
 
 undertow.setting.session-cookie=Session cookie configuration
 undertow.setting.session-cookie.add=Add session cookie configuration

webservices/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java

@@ -84,7 +84,7 @@ private void configureEndpoints(final Deployment dep, final JBossWebMetaData jbo
         // fix servlet class names for endpoints
         for (final ServletMetaData servletMD : jbossWebMD.getServlets()) {
             final String endpointClassName = ASHelper.getEndpointClassName(servletMD);
-            if (endpointClassName != null && endpointClassName.length() > 0) { // exclude JSP
+            if (endpointClassName != null && endpointClassName.length() > 0) { // exclude Jakarta Server Pages
                 if (epNames.contains(endpointClassName)) {
                     // set transport servlet
                     servletMD.setServletClass(WSFServlet.class.getName());

weld/subsystem/src/main/java/org/jboss/as/weld/webtier/jsp/WeldJspExpressionFactoryWrapper.java

@@ -34,7 +34,7 @@
 import org.jboss.as.weld.util.Reflections;
 
 /**
- * The Web Beans JSP initialization listener
+ * The Web Beans Jakarta Server Pages initialization listener
  *
  * @author Pete Muir
  * @author Stuart Douglas
@@ -53,7 +53,7 @@ public ExpressionFactory wrap(ExpressionFactory expressionFactory, ServletContex
         // get JspApplicationContext.
         JspApplicationContext jspAppContext = JspFactory.getDefaultFactory().getJspApplicationContext( servletContext);
 
-        // register compositeELResolver with JSP
+        // register compositeELResolver with Jakarta Server Pages
         jspAppContext.addELResolver(beanManager.getELResolver());
         jspAppContext.addELContextListener(Reflections.<ELContextListener>newInstance("org.jboss.weld.module.web.el.WeldELContextListener", getClass().getClassLoader()));