diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml
index bc2cc37..1742963 100644
--- 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
index a7e5234..d274317 100755
--- 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
index 4c73dbd..c312aac 100644
--- 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
index a56ebf4..28a852d 100644
--- 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
index a56ebf4..28a852d 100644
--- 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
index a56ebf4..28a852d 100644
--- 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/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml b/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
index dc6ccfd..fbd87c4 100644
--- a/appserver/tests/embedded/web/web-api/src/main/resources/org/glassfish/tests/webapi/my-default-web.xml
+++ b/appserver/tests/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
index 80d175e..b25a26a 100644
--- 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
index 66dd64e..99ca161 100644
--- a/docs/administration-guide/src/main/asciidoc/logging.adoc
+++ b/docs/administration-guide/src/main/asciidoc/logging.adoc
@@ -268,7 +268,7 @@
 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
index 92ea382..7424ea7 100644
--- 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 @@
 ----
 <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
index e4f79c4..044191d 100644
--- 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.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/docs/website/src/main/resources/certifications/jakarta-connectors/2.1/TCK-Results.md b/docs/website/src/main/resources/certifications/jakarta-connectors/2.1/TCK-Results.md
new file mode 100644
index 0000000..a429393
--- /dev/null
+++ b/docs/website/src/main/resources/certifications/jakarta-connectors/2.1/TCK-Results.md
@@ -0,0 +1,183 @@
+TCK Results
+===========
+
+As required by the
+[Eclipse Foundation Technology Compatibility Kit License](https://www.eclipse.org/legal/tck.php),
+following is a summary of the TCK results for releases of Jakarta Connectors.
+
+# 2.1 Certification Request
+
+- [x] Organization Name ("Organization") and, if applicable, URL: <br/>
+  Eclipse Foundation
+- [x] Product Name, Version and download URL (if applicable): <br/>
+  [GlassFish 7.0.0-M4](https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0-M4/glassfish-7.0.0-M4.zip)
+- [x] Specification Name, Version and download URL: <br/>
+  [Jakarta Connectors 2.1](https://jakarta.ee/specifications/connectors/2.1/)
+- [x] TCK Version, digital SHA-256 fingerprint and download URL: <br/>
+  [Jakarta Connectors TCK 2.1.0](https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/jakarta-connectors-tck-2.1.0.zip), SHA-256: 9af19fb2401b6faee29640d2063db85ec85e97283934b5bcb77c89fa3ca53958
+- [x] Public URL of TCK Results Summary: <br/>
+  [TCK results summary](https://eclipse-ee4j.github.io/glassfish/certifications/jakarta-connectors/2.1/TCK-Results)
+- [x] Any Additional Specification Certification Requirements: <br/>
+  None
+- [x] Java runtime used to run the implementation: <br/>
+openjdk version "11.0.2" 2019-01-15
+OpenJDK Runtime Environment 18.9 (build 11.0.2+9)
+OpenJDK 64-Bit Server VM 18.9 (build 11.0.2+9, mixed mode)
+- [x] Summary of the information for the certification environment, operating system, cloud, ...: <br/>
+Linux basic-z8drp 5.14.14-200.fc34.x86_64 #1 SMP Wed Oct 20 16:15:12 UTC 2021 x86_64 GNU/Linux
+- [x] By checking this box I acknowledge that the Organization I represent accepts the terms of the [EFTL](https://www.eclipse.org/legal/tck.php).
+- [x] By checking this box I attest that all TCK requirements have been met, including any compatibility rules.
+
+
+Test results:
+
+```
+[javatest.batch] Number of tests completed:  133 (133 passed, 0 failed, 0 with errors)
+[javatest.batch] Number of tests remaining:  0
+[javatest.batch] ********************************************************************************
+[javatest.batch] Completed running 133 tests.
+[javatest.batch] Number of Tests Passed      = 133
+[javatest.batch] Number of Tests Failed      = 0
+[javatest.batch] Number of Tests with Errors = 0
+[javatest.batch] ********************************************************************************
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/anno/annotationClient.java#testConfigPropertyAnnotation_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/anno/annotationClient.java#testConnectorAnnotation_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/anno/annotationClient.java#testRAAccessibility_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/anno/annotationClient.java#testSetterMethodConfigPropAnno_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/mdcomplete/Client.java#testMDCompleteConfigProp_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/mdcomplete/Client.java#testMDCompleteMCFAnno_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testDDOverridesAnno_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testMixedModeConfigPropertyMCF_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testMixedModeConfigPropertyNoOverride_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testMixedModeConfigPropertyOverride_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testMixedModeConfigPropertyRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/annotations/partialanno/paClient.java#testNoDefaultVallAnnoElement_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/connManager/connManagerClient1.java#testcheckConnectionManager_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/connManager/connManagerClient1.java#testTransactionSupportLevels_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIApplicationServerInternalException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPICommException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIEISSystemException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIHintsContext_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIIllegalStateException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIInvalidPropertyException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPILocalTransactionException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIManagedConnection_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIManagedConnectionMetaData_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPINotSupportedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIResourceAdapterInternalException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIResourceAllocationException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIResourceException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIRetryableUnavailableException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIRetryableWorkRejectedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPISecurityException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPISharingViolationException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIUnavailableException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIWorkCompletedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIWorkException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testAPIWorkRejectedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testGetConnection1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/connection/connectionClient1.java#testgetConnectionWithParameter1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/event/eventClient1.java#testConnectionEventListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testAssociationMCFandRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testAssociationMCFandRA2_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testBootstrapforNull_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testInstantiationOfRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testMCFcalledOnce_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testRAforJavaBean_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/lifecycle/lifecycleClient1.java#testRASharability_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testAppEISSignon_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestAllCallbacksAndPrin_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestAllCallbacksNullPrin_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestCPCandGPC_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestCPCandNullPrin_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestCPCandPrin_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestCPCandPVC_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestEISCPCandPrin_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testCBTestGPCandCPCFail_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testComponentManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testConnManagerAllocateConnection_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/security/securityClient1.java#testContainerManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1.java#testConcurrentWorkXid_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1.java#testGetTransactionSupport_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1.java#testSetResourceAdapterMethod_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1.java#testTransactionSynchronizationRegistry_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/transinflow/transinflowClient1.java#testXATerminator_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testHICNotifications_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testIsContextSupported_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testNestedWorkContexts_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testNestedWorkContexts2_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testNestedWorkContexts3_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testSecurityContextCBH_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testSecurityContextExecSubject_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testSecurityContextServiceSubject_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testWorkContextErrorCode_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testWorkContextErrorCode2_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testWorkContextNotifications_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workcontext/WorkContextClient.java#testWorkContextProvider_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testForUnsharedTimer_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testNestedWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testScheduleWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testScheduleWorkListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testUnknownWorkDuration_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testWorkCompletedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testWorkListenerImplementation_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/localTx/workmgt/workmgtClient1.java#testWorkManagerImplementaion_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/connection/connectionClient1.java#testGetConnection1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/connection/connectionClient1.java#testgetConnectionWithParameter1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/event/eventClient1.java#testConnectionEventListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testAssociationMCFandRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testAssociationMCFandRA2_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testBootstrapforNull_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testInstantiationOfRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testMCFcalledOnce_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testRAforJavaBean_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/lifecycle/lifecycleClient1.java#testRASharability_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/security/securityClient1.java#testAppEISSignon_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/security/securityClient1.java#testComponentManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/security/securityClient1.java#testConnManagerAllocateConnection_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/security/securityClient1.java#testContainerManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testForUnsharedTimer_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testNestedWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testScheduleWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testScheduleWorkListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testUnknownWorkDuration_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testWorkCompletedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testWorkListenerImplementation_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/noTx/workmgt/workmgtClient1.java#testWorkManagerImplementaion_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateCustomPerm_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateLocalGrantForCustomPerm_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateLocalPermsInvalidName_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateMissingPermFails_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateRequiredPermSet_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/permissiondd/Client.java#testValidateRestrictedLocalPerm_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/connection/connectionClient1.java#testGetConnection1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/connection/connectionClient1.java#testgetConnectionWithParameter1_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/event/eventClient1.java#testConnectionEventListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testAssociationMCFandRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testAssociationMCFandRA2_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testBootstrapforNull_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testInstantiationOfRA_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testMCFcalledOnce_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testRAforJavaBean_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/lifecycle/lifecycleClient1.java#testRASharability_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/security/securityClient1.java#testAppEISSignon_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/security/securityClient1.java#testComponentManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/security/securityClient1.java#testConnManagerAllocateConnection_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/security/securityClient1.java#testContainerManaged_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testForUnsharedTimer_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testNestedWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testScheduleWork_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testScheduleWorkListener_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testUnknownWorkDuration_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testWorkCompletedException_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testWorkListenerImplementation_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/connector/xa/workmgt/workmgtClient1.java#testWorkManagerImplementaion_from_connectorservlet
+[javatest.batch] PASSED........com/sun/ts/tests/signaturetest/connector/ConnectorSigTest.java#signatureTest
+[javatest.batch] 
+[javatest.batch] Apr 17, 2022, 11:32:38 AM Finished executing all tests, wait for cleanup...
+[javatest.batch] Apr 17, 2022, 11:32:38 AM Harness done with cleanup from test run.
+[javatest.batch] Total time = 302s
+[javatest.batch] Setup time = 0s
+[javatest.batch] Cleanup time = 0s
+[javatest.batch] Test results: passed: 133
+```
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
index d2afea7..aa07bb7 100644
--- 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
index d2afea7..aa07bb7 100644
--- 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
index d2afea7..aa07bb7 100644
--- 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
index d2afea7..aa07bb7 100644
--- 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
index 01e69de..06ff315 100644
--- a/nucleus/admin/template/src/main/resources/config/logging.properties
+++ b/nucleus/admin/template/src/main/resources/config/logging.properties
@@ -41,7 +41,7 @@
 #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/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1 b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
index 36b6d49..95c79af 100644
--- a/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
+++ b/nucleus/core/logging/src/main/manpages/com/sun/enterprise/server/logging/commands/list-log-levels.1
@@ -81,7 +81,7 @@
                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/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/odl-server.log b/nucleus/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/odl-server.log
index 948c7a3..9895a2f 100644
--- a/nucleus/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/odl-server.log
+++ b/nucleus/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/nucleus/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/uniform-server.log b/nucleus/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/uniform-server.log
index 1085ada..cae6aab 100644
--- a/nucleus/core/logging/src/test/resources/com/sun/enterprise/server/logging/parser/uniform-server.log
+++ b/nucleus/core/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
index 194935a..41d67b4 100644
--- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
+++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc
@@ -23,4 +23,4 @@
 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
index 4564f44..9eb85d7 100644
--- 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 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/" %*