Eclipse WaSP : Refactor org.apache.jasper to org.glassfish.wasp

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
eclipse-ee4j · Apr 22, 2022 · 0d9e66d · 0d9e66d
1 parent 5004f5f
commit 0d9e66d
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 41 deletions.
diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
@@ -275,7 +275,7 @@
   <!-- * Set the "classpath" initialization parameter appropriately         -->
   <!--   for this web application.                                          -->
   <!-- * Set the "jspCompilerPlugin" initialization parameter to            -->
-  <!--   "org.apache.jasper.compiler.JikesJavaCompiler".                    -->
+  <!--   "org.glassfish.wasp.compiler.JikesJavaCompiler".                    -->
 
   <servlet>
     <servlet-name>jsp</servlet-name>

diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
@@ -355,9 +355,9 @@
                                 org.glassfish.hk2.security;
                                 com.sun.faces.config;
                                 com.sun.jersey.server.impl.container.servlet;
-                                org.apache.jasper.runtime;
+                                org.glassfish.wasp.runtime;
                                 com.sun.xml.ws.transport.http.servlet;
-                                org.apache.jasper.servlet;
+                                org.glassfish.wasp.servlet;
                                 resolution:=optional
                             </value>
                         </configuration>

diff --git a/appserver/tests/appserv-tests/devtests/web/elequals/docroot/equals.jsp b/appserver/tests/appserv-tests/devtests/web/elequals/docroot/equals.jsp
@@ -17,21 +17,21 @@
 --%>
 
 <%
-jakarta.el.ValueExpression v1 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${A+B}", pageContext, Object.class, null);
-jakarta.el.ValueExpression v2 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${ A + B }", pageContext, Object.class, null);
+jakarta.el.ValueExpression v1 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${A+B}", pageContext, Object.class, null);
+jakarta.el.ValueExpression v2 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${ A + B }", pageContext, Object.class, null);
 out.write("Comparing ${A+B} with ${ A + B }: " + (v1.equals(v2)? "PASS\n": "FAIL\n"));
 
-v1 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${A}", pageContext, Object.class, null);
-v2 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("#{ A  }", pageContext, Object.class, null);
+v1 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${A}", pageContext, Object.class, null);
+v2 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("#{ A  }", pageContext, Object.class, null);
 out.write("Comparing ${A} with #{A}: " + (v1.equals(v2)? "PASS\n": "FAIL\n"));
 
 /*
-v1 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${a.b}", pageContext, Object.class, null);
-v2 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${a['b']}", pageContext, Object.class, null);
+v1 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${a.b}", pageContext, Object.class, null);
+v2 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${a['b']}", pageContext, Object.class, null);
 out.write(v1.equals(v2)? "equals": "not equal");
 out.write("</br>\n");
 */
-v1 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${A<B}", pageContext, Object.class, null);
-v2 =  org.apache.jasper.runtime.PageContextImpl.getValueExpression("${ A lt B }", pageContext, Object.class, null);
+v1 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${A<B}", pageContext, Object.class, null);
+v2 =  org.glassfish.wasp.runtime.PageContextImpl.getValueExpression("${ A lt B }", pageContext, Object.class, null);
 out.write("Comparing ${A<B} with ${ A lt B }: " + (v1.equals(v2)? "PASS\n": "FAIL\n"));
 %>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/descriptor/tagPlugins.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/descriptor/tagPlugins.xml
@@ -19,22 +19,22 @@
 <tag-plugins>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.If</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.If</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Choose</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Choose</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.When</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.When</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Otherwise</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Otherwise</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.ForEach</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.ForEach</plugin-class>
   </tag-plugin>
 </tag-plugins>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/descriptor/tagPlugins.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/descriptor/tagPlugins.xml
@@ -19,22 +19,22 @@
 <tag-plugins>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.If</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.If</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Choose</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Choose</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.When</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.When</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Otherwise</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Otherwise</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.ForEach</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.ForEach</plugin-class>
   </tag-plugin>
 </tag-plugins>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagplugin/descriptor/tagPlugins.xml b/appserver/tests/appserv-tests/devtests/web/tagplugin/descriptor/tagPlugins.xml
@@ -19,22 +19,22 @@
 <tag-plugins>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.IfTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.If</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.If</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Choose</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Choose</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.WhenTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.When</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.When</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.Otherwise</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.Otherwise</plugin-class>
   </tag-plugin>
   <tag-plugin>
     <tag-class>org.apache.taglibs.standard.tag.rt.core.ForEachTag</tag-class>
-    <plugin-class>org.apache.jasper.tagplugins.jstl.ForEach</plugin-class>
+    <plugin-class>org.glassfish.wasp.tagplugins.jstl.ForEach</plugin-class>
   </tag-plugin>
 </tag-plugins>
diff --git a/...sts/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml b/...sts/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
@@ -265,7 +265,7 @@
   <!-- * Set the "classpath" initialization parameter appropriately         -->
   <!--   for this web application.                                          -->
   <!-- * Set the "jspCompilerPlugin" initialization parameter to            -->
-  <!--   "org.apache.jasper.compiler.JikesJavaCompiler".                    -->
+  <!--   "org.glassfish.wasp.compiler.JikesJavaCompiler".                    -->
 
   <servlet>
     <servlet-name>jsp</servlet-name>

diff --git a/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml b/appserver/web/web-embed/api/src/main/resources/org/glassfish/web/embed/default-web.xml
@@ -268,7 +268,7 @@
   <!-- * Set the "classpath" initialization parameter appropriately         -->
   <!--   for this web application.                                          -->
   <!-- * Set the "jspCompilerPlugin" initialization parameter to            -->
-  <!--   "org.apache.jasper.compiler.JikesJavaCompiler".                    -->
+  <!--   "org.glassfish.wasp.compiler.JikesJavaCompiler".                    -->
 
   <servlet>
     <servlet-name>jsp</servlet-name>

diff --git a/docs/administration-guide/src/main/asciidoc/logging.adoc b/docs/administration-guide/src/main/asciidoc/logging.adoc
@@ -268,7 +268,7 @@ jakarta.enterprise.system.webservices.saaj      <INFO>
 javax     <INFO>
 org.apache.catalina    <INFO>
 org.apache.coyote      <INFO>
-org.apache.jasper      <INFO>
+org.glassfish.wasp      <INFO>
 org.jvnet.hk2.osgiadapter   <INFO>
 ----
 

diff --git a/docs/performance-tuning-guide/src/main/asciidoc/tuning-glassfish.adoc b/docs/performance-tuning-guide/src/main/asciidoc/tuning-glassfish.adoc
@@ -237,7 +237,7 @@ a JSP file to look like this:
 ----
 <servlet>
   <servlet-name>jsp</servlet-name>
-  <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+  <servlet-class>org.glassfish.wasp.servlet.JspServlet</servlet-class>
   <init-param>
     <param-name>development</param-name>
     <param-value>false</param-value>

diff --git a/docs/reference-manual/src/main/asciidoc/list-log-levels.adoc b/docs/reference-manual/src/main/asciidoc/list-log-levels.adoc
@@ -115,7 +115,7 @@ javax   <INFO>
 javax.org.glassfish.persistence <INFO>
 org.apache.catalina     <INFO>
 org.apache.coyote       <INFO>
-org.apache.jasper       <INFO>
+org.glassfish.wasp       <INFO>
 org.glassfish.admingui  <INFO>
 org.jvnet.hk2.osgiadapter       <INFO>
 Command list-log-levels executed successfully.

diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain1/config/logging.properties
@@ -20,7 +20,7 @@
 jakarta.enterprise.system.tools.admin.level=INFO
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-org.apache.jasper.level=INFO
+org.glassfish.wasp.level=INFO
 jakarta.enterprise.resource.corba.level=INFO
 jakarta.enterprise.system.core.classloading.level=INFO
 jakarta.enterprise.resource.jta.level=INFO

diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain2/config/logging.properties
@@ -20,7 +20,7 @@
 jakarta.enterprise.system.tools.admin.level=INFO
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-org.apache.jasper.level=INFO
+org.glassfish.wasp.level=INFO
 jakarta.enterprise.resource.corba.level=INFO
 jakarta.enterprise.system.core.classloading.level=INFO
 jakarta.enterprise.resource.jta.level=INFO

diff --git a/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domain3/config/logging.properties
@@ -20,7 +20,7 @@
 jakarta.enterprise.system.tools.admin.level=INFO
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-org.apache.jasper.level=INFO
+org.glassfish.wasp.level=INFO
 jakarta.enterprise.resource.corba.level=INFO
 jakarta.enterprise.system.core.classloading.level=INFO
 jakarta.enterprise.resource.jta.level=INFO

diff --git a/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties b/nucleus/admin/launcher/src/test/resources/domains/domainNoLog/config/logging.properties
@@ -20,7 +20,7 @@
 jakarta.enterprise.system.tools.admin.level=INFO
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-org.apache.jasper.level=INFO
+org.glassfish.wasp.level=INFO
 jakarta.enterprise.resource.corba.level=INFO
 jakarta.enterprise.system.core.classloading.level=INFO
 jakarta.enterprise.resource.jta.level=INFO

diff --git a/nucleus/admin/template/src/main/resources/config/logging.properties b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -41,7 +41,7 @@ java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
 #All log level details
 com.sun.enterprise.server.logging.GFFileHandler.level=ALL
 jakarta.enterprise.system.tools.admin.level=INFO
-org.apache.jasper.level=INFO
+org.glassfish.wasp.level=INFO
 jakarta.enterprise.system.core.level=INFO
 jakarta.enterprise.system.core.classloading.level=INFO
 java.util.logging.ConsoleHandler.level=FINEST

diff --git a/...re/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1 b/...re/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
@@ -81,7 +81,7 @@ EXAMPLES
                javax.org.glassfish.persistence <INFO>
                org.apache.catalina     <INFO>
                org.apache.coyote       <INFO>
-               org.apache.jasper       <INFO>
+               org.glassfish.wasp       <INFO>
                org.glassfish.admingui  <INFO>
                org.jvnet.hk2.osgiadapter       <INFO>
                Command list-log-levels executed successfully.

diff --git a/...s/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/odl-server.log b/...s/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/odl-server.log
@@ -37,7 +37,7 @@
 Hello World XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX0
 java.lang.Exception
 	at org.apache.jsp.hello_jsp._jspService(hello_jsp.java:71)
-	at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:111)
+	at org.glassfish.wasp.runtime.HttpJspBase.service(HttpJspBase.java:111)
 	at javax.servlet.http.HttpServlet.service(HttpServlet.java:790)
 	at org.glassfish.wasp.servlet.JspServletWrapper.service(JspServletWrapper.java:411)
 	at org.glassfish.wasp.servlet.JspServlet.serviceJspFile(JspServlet.java:473)

diff --git a/...re/logging/src/test/resources/com/sun/enterprise/server/logging/parser/uniform-server.log b/...re/logging/src/test/resources/com/sun/enterprise/server/logging/parser/uniform-server.log
@@ -243,7 +243,7 @@
 [#|2012-10-19T15:29:24.601-0400|WARNING|44.0|com.oracle.logging|_ThreadID=114;_ThreadName=http-listener-1(1);_TimeMillis=1350674964601;_LevelValue=900;|Hello World XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX0
 java.lang.Exception
 	at org.apache.jsp.hello_jsp._jspService(hello_jsp.java:71)
-	at org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:111)
+	at org.glassfish.wasp.runtime.HttpJspBase.service(HttpJspBase.java:111)
 	at javax.servlet.http.HttpServlet.service(HttpServlet.java:790)
 	at org.glassfish.wasp.servlet.JspServletWrapper.service(JspServletWrapper.java:411)
 	at org.glassfish.wasp.servlet.JspServlet.serviceJspFile(JspServlet.java:473)

diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
@@ -23,4 +23,4 @@ JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar
 AS_LIB=$AS_INSTALL/lib
 JAKARTAEE_API=$AS_lib/jakartaee.jar
 
-java -cp "$JSP_IMPL:$JAKARTAEE_API:$AS_LIB" org.apache.jasper.JspC -sysClasspath "$JSP_IMPL:$EL_IMPL:$JSTL_IMPL:$JAKARTAEE_API:$AS_LIB" -schemas "/schemas/" -dtds "/dtds/" "$@"
+java -cp "$JSP_IMPL:$JAKARTAEE_API:$AS_LIB" org.glassfish.wasp.JspC -sysClasspath "$JSP_IMPL:$EL_IMPL:$JSTL_IMPL:$JAKARTAEE_API:$AS_LIB" -schemas "/schemas/" -dtds "/dtds/" "$@"
diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat
@@ -24,4 +24,4 @@ set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar
 set AS_LIB=%~dp0..\lib
 set JAKARTAEE_API=%AS_LIB%\jakartaee.jar
 
-java -cp "%JSP_IMPL%;%JAKARTAEE_API%;%AS_LIB%" org.apache.jasper.JspC -sysClasspath "%JSP_IMPL%;%EL_IMPL%;%JSTL_IMPL%;%JAKARTAEE_API%;%AS_LIB%" -schemas "/schemas/" -dtds "/dtds/" %*
+java -cp "%JSP_IMPL%;%JAKARTAEE_API%;%AS_LIB%" org.glassfish.wasp.JspC -sysClasspath "%JSP_IMPL%;%EL_IMPL%;%JSTL_IMPL%;%JAKARTAEE_API%;%AS_LIB%" -schemas "/schemas/" -dtds "/dtds/" %*