[#1802] Switch pax-web-itest-jsp from javax to jakarta

ops4j · Jun 19, 2023 · b9f3e03 · b9f3e03
1 parent 95d42dc
commit b9f3e03
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 70 deletions.
diff --git a/pax-web-itest/pax-web-itest-jsp/pom.xml b/pax-web-itest/pax-web-itest-jsp/pom.xml
@@ -128,7 +128,7 @@
 			<artifactId>osgi.core</artifactId>
 		</dependency>
 
-		<!-- JavaEE (the packages not re-exported by pax-web-jsp) -->
+		<!-- JakartaEE (the packages not re-exported by pax-web-jsp) -->
 
 		<dependency>
 			<groupId>jakarta.el</groupId>

diff --git a/pax-web-itest/pax-web-itest-jsp/src/main/java/org/ops4j/pax/web/test/tags/TestTag.java b/pax-web-itest/pax-web-itest-jsp/src/main/java/org/ops4j/pax/web/test/tags/TestTag.java
@@ -16,8 +16,8 @@
 package org.ops4j.pax.web.test.tags;
 
 import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
 
 public class TestTag extends TagSupport {
 

diff --git a/...b-itest/pax-web-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/ElIntegrationTest.java b/...b-itest/pax-web-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/ElIntegrationTest.java
@@ -17,12 +17,12 @@
 package org.ops4j.pax.web.test.jsp;
 
 import java.util.ServiceLoader;
-import javax.el.ELContext;
-import javax.el.ELManager;
-import javax.el.ELProcessor;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.ValueExpression;
+import jakarta.el.ELContext;
+import jakarta.el.ELManager;
+import jakarta.el.ELProcessor;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.ValueExpression;
 
 import org.junit.Test;
 import org.slf4j.Logger;

diff --git a/...eb-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebCustomTldIntegrationTest.java b/...eb-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebCustomTldIntegrationTest.java
@@ -21,13 +21,13 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import javax.servlet.descriptor.TaglibDescriptor;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.descriptor.JspPropertyGroupDescriptor;
+import jakarta.servlet.descriptor.TaglibDescriptor;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -68,7 +68,7 @@ public class PaxWebCustomTldIntegrationTest {
 	@BeforeClass
 	@SuppressWarnings("JavaReflectionInvocation")
 	public static void initStatic() throws Exception {
-		Class<?> jspFactoryClass = Class.forName("javax.servlet.jsp.JspFactory");
+		Class<?> jspFactoryClass = Class.forName("jakarta.servlet.jsp.JspFactory");
 		Method setDefaultFactory = jspFactoryClass.getDeclaredMethod("setDefaultFactory", jspFactoryClass);
 		Class<?> jspFactoryImplClass = Class.forName("org.apache.jasper.runtime.JspFactoryImpl");
 		setDefaultFactory.invoke(null, jspFactoryClass.cast(jspFactoryImplClass.getConstructor().newInstance()));
@@ -168,6 +168,11 @@ public String getBuffer() {
 							public String getErrorOnUndeclaredNamespace() {
 								return "false";
 							}
+
+							@Override
+							public String getErrorOnELNotFound() {
+								return "false";
+							}
 						});
 					}
 				};

diff --git a/.../pax-web-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebJspIntegrationTest.java b/.../pax-web-itest-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebJspIntegrationTest.java
@@ -19,11 +19,11 @@
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
@@ -64,7 +64,7 @@ public class PaxWebJspIntegrationTest {
 	@BeforeClass
 	@SuppressWarnings("JavaReflectionInvocation")
 	public static void initStatic() throws Exception {
-		Class<?> jspFactoryClass = Class.forName("javax.servlet.jsp.JspFactory");
+		Class<?> jspFactoryClass = Class.forName("jakarta.servlet.jsp.JspFactory");
 		Method setDefaultFactory = jspFactoryClass.getDeclaredMethod("setDefaultFactory", jspFactoryClass);
 		Class<?> jspFactoryImplClass = Class.forName("org.apache.jasper.runtime.JspFactoryImpl");
 		setDefaultFactory.invoke(null, jspFactoryClass.cast(jspFactoryImplClass.getConstructor().newInstance()));

diff --git a/...est-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebJspNoScriptingIntegrationTest.java b/...est-jsp/src/test/java/org/ops4j/pax/web/test/jsp/PaxWebJspNoScriptingIntegrationTest.java
@@ -22,12 +22,12 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.UUID;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.descriptor.JspConfigDescriptor;
-import javax.servlet.descriptor.JspPropertyGroupDescriptor;
-import javax.servlet.descriptor.TaglibDescriptor;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.descriptor.JspPropertyGroupDescriptor;
+import jakarta.servlet.descriptor.TaglibDescriptor;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -61,7 +61,7 @@ public class PaxWebJspNoScriptingIntegrationTest {
 
 	@BeforeClass
 	public static void initStatic() throws Exception {
-		Class<?> jspFactoryClass = Class.forName("javax.servlet.jsp.JspFactory");
+		Class<?> jspFactoryClass = Class.forName("jakarta.servlet.jsp.JspFactory");
 		Method setDefaultFactory = jspFactoryClass.getDeclaredMethod("setDefaultFactory", jspFactoryClass);
 		Class<?> jspFactoryImplClass = Class.forName("org.apache.jasper.runtime.JspFactoryImpl");
 		setDefaultFactory.invoke(null, jspFactoryClass.cast(jspFactoryImplClass.getConstructor().newInstance()));
@@ -147,6 +147,11 @@ public String getBuffer() {
 							public String getErrorOnUndeclaredNamespace() {
 								return "false";
 							}
+
+							@Override
+							public String getErrorOnELNotFound() {
+								return "false";
+							}
 						});
 					}
 				};

diff --git a/pax-web-jsp/pom.xml b/pax-web-jsp/pom.xml
@@ -200,7 +200,7 @@
 							{maven-dependencies}
 						</Include-Resource>
 						<Embed-Dependency>
-							artifactId=taglibs-standard-impl;inline=**/*.tld
+							artifactId=jakarta.servlet.jsp.jstl;inline=**/*.tld
 						</Embed-Dependency>
 						<_nouses>true</_nouses>
 						<_contract>!*</_contract>

diff --git a/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory b/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory
diff --git a/pax-web-jsp/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/pax-web-jsp/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer