[#1802] Switch to jakarta in some missing places

ops4j · Jul 26, 2023 · 5542210 · 5542210
1 parent 7cc0d9f
commit 5542210
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 39 deletions.
diff --git a/pax-web-deployer/pom.xml b/pax-web-deployer/pom.xml
@@ -92,7 +92,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/pax-web-fragments/pax-web-compatibility-annotation13/pom.xml b/pax-web-fragments/pax-web-compatibility-annotation13/pom.xml
@@ -59,7 +59,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.annotation</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-cdi12/pom.xml b/pax-web-fragments/pax-web-compatibility-cdi12/pom.xml
@@ -84,7 +84,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.enterprise</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-el2/pom.xml b/pax-web-fragments/pax-web-compatibility-el2/pom.xml
@@ -65,7 +65,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.el</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-interceptor12/pom.xml b/pax-web-fragments/pax-web-compatibility-interceptor12/pom.xml
@@ -59,7 +59,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.interceptor</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-jaxrs2/pom.xml b/pax-web-fragments/pax-web-compatibility-jaxrs2/pom.xml
@@ -59,7 +59,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-jpa2/pom.xml b/pax-web-fragments/pax-web-compatibility-jpa2/pom.xml
@@ -59,7 +59,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.persistence</groupId>

diff --git a/pax-web-fragments/pax-web-compatibility-servlet31/pom.xml b/pax-web-fragments/pax-web-compatibility-servlet31/pom.xml
@@ -64,7 +64,7 @@
 
 	<dependencies>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-jetty/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-jetty/pom.xml
@@ -91,7 +91,7 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<!--

diff --git a/...rc/test/java/org/ops4j/pax/web/itest/jetty/config/JettyHandlerServiceIntegrationTest.java b/...rc/test/java/org/ops4j/pax/web/itest/jetty/config/JettyHandlerServiceIntegrationTest.java
@@ -77,12 +77,14 @@ public void testStaticContent() throws Exception {
 		ContextHandler ctxtHandler = new ContextHandler();
 		ctxtHandler.setContextPath("/static-content");
 		ResourceHandler resourceHandler = new ResourceHandler();
-		resourceHandler.setResourceBase("target");
-		resourceHandler.setDirectoriesListed(true);
+		resourceHandler.setBaseResourceAsString("target");
+		resourceHandler.setDirAllowed(true);
 		ctxtHandler.setHandler(resourceHandler);
 
-		HttpConfiguration.Customizer customizer = (connector1, channelConfig, request)
-				-> request.getResponse().addHeader("X-Y-Z", "x-y-z");
+		HttpConfiguration.Customizer customizer = (request, responseHeaders) -> {
+			responseHeaders.add("X-Y-Z", "x-y-z");
+			return request;
+		};
 
 		@SuppressWarnings("unchecked")
 		final ServiceRegistration<Handler>[] registerHandlerService = new ServiceRegistration[1];

diff --git a/...est-jetty/src/test/java/org/ops4j/pax/web/itest/jetty/war/WarExtendedIntegrationTest.java b/...est-jetty/src/test/java/org/ops4j/pax/web/itest/jetty/war/WarExtendedIntegrationTest.java
@@ -16,7 +16,7 @@
 
 package org.ops4j.pax.web.itest.jetty.war;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...b-itest-jetty/src/test/java/org/ops4j/pax/web/itest/jetty/war/WarPostIntegrationTest.java b/...b-itest-jetty/src/test/java/org/ops4j/pax/web/itest/jetty/war/WarPostIntegrationTest.java
@@ -15,7 +15,7 @@
  */
 package org.ops4j.pax.web.itest.jetty.war;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;

diff --git a/...etty/src/test/java/org/ops4j/pax/web/itest/jetty/websockets/WebSocketIntegrationTest.java b/...etty/src/test/java/org/ops4j/pax/web/itest/jetty/websockets/WebSocketIntegrationTest.java
@@ -38,7 +38,7 @@ public Option[] configure() {
 
 	@Override
 	protected String getContainerSpecificWebSocketsBundleSN() {
-		return "org.eclipse.jetty.websocket.javax.client";
+		return "org.eclipse.jetty.ee10.websocket.jakarta.client";
 	}
 
 }
diff --git a/...est/java/org/ops4j/pax/web/itest/jetty/websockets/WebSocketWhiteBoardIntegrationTest.java b/...est/java/org/ops4j/pax/web/itest/jetty/websockets/WebSocketWhiteBoardIntegrationTest.java
@@ -38,7 +38,7 @@ public Option[] configure() {
 
 	@Override
 	protected String getContainerSpecificWebSocketsBundleSN() {
-		return "org.eclipse.jetty.websocket.javax.client";
+		return "org.eclipse.jetty.ee10.websocket.jakarta.client";
 	}
 
 }
diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-tomcat/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-tomcat/pom.xml
@@ -101,7 +101,7 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<!--

diff --git a/...itest-tomcat/src/test/java/org/ops4j/pax/web/itest/tomcat/war/WarPostIntegrationTest.java b/...itest-tomcat/src/test/java/org/ops4j/pax/web/itest/tomcat/war/WarPostIntegrationTest.java
@@ -15,7 +15,7 @@
  */
 package org.ops4j.pax.web.itest.tomcat.war;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;

diff --git a/pax-web-itest/pax-web-itest-container/pax-web-itest-undertow/pom.xml b/pax-web-itest/pax-web-itest-container/pax-web-itest-undertow/pom.xml
@@ -111,7 +111,7 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<!--

diff --git a/...rc/test/java/org/ops4j/pax/web/itest/undertow/httpservice/HttpServiceIntegrationTest.java b/...rc/test/java/org/ops4j/pax/web/itest/undertow/httpservice/HttpServiceIntegrationTest.java
@@ -15,7 +15,7 @@
  */
 package org.ops4j.pax.web.itest.undertow.httpservice;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +24,7 @@
 import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.web.itest.container.httpservice.AbstractHttpServiceIntegrationTest;
 import org.ops4j.pax.web.itest.utils.client.HttpTestClientFactory;
-import org.osgi.service.http.HttpService;
+import org.ops4j.pax.web.service.http.HttpService;
 
 import static org.ops4j.pax.exam.OptionUtils.combine;
 

diff --git a/...dertow/src/test/java/org/ops4j/pax/web/itest/undertow/war/WarExtendedIntegrationTest.java b/...dertow/src/test/java/org/ops4j/pax/web/itest/undertow/war/WarExtendedIntegrationTest.java
@@ -17,7 +17,7 @@
 package org.ops4j.pax.web.itest.undertow.war;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.After;
 import org.junit.Before;

diff --git a/...t-undertow/src/test/java/org/ops4j/pax/web/itest/undertow/war/WarPostIntegrationTest.java b/...t-undertow/src/test/java/org/ops4j/pax/web/itest/undertow/war/WarPostIntegrationTest.java
@@ -15,7 +15,7 @@
  */
 package org.ops4j.pax.web.itest.undertow.war;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.runner.RunWith;

diff --git a/pax-web-itest/pax-web-itest-karaf/pom.xml b/pax-web-itest/pax-web-itest-karaf/pom.xml
@@ -348,7 +348,7 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
@@ -407,7 +407,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 		</dependency>
 
 		<!-- Other -->

diff --git a/pax-web-itest/pax-web-itest-keycloak/pom.xml b/pax-web-itest/pax-web-itest-keycloak/pom.xml
@@ -216,7 +216,7 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
@@ -247,7 +247,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/...erver/src/test/java/org/ops4j/pax/web/itest/server/controller/SecurityParametersTest.java b/...erver/src/test/java/org/ops4j/pax/web/itest/server/controller/SecurityParametersTest.java
@@ -150,7 +150,7 @@ public void testSecurityProtocolsAndCiphers() throws Exception {
 		// TLS 1.3 (https://www.rfc-editor.org/rfc/rfc8446.html#appendix-B.4):
 		// - TLS_AES_256_GCM_SHA384
 		// - TLS_AES_128_GCM_SHA256
-		// - TLS_CHACHA20_POLY1305_SHA256 (unsupported)
+		// - TLS_CHACHA20_POLY1305_SHA256 (unsupported in JDK8)
 		// - TLS_AES_128_CCM_SHA256 (unsupported)
 		// - TLS_AES_128_CCM_8_SHA256 (unsupported)
 		// TLS 1.2 (in order of appearance in sun.security.ssl.CipherSuite)

diff --git a/pax-web-karaf/pom.xml b/pax-web-karaf/pom.xml
@@ -133,7 +133,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
@@ -150,7 +150,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/pax-web-manual/src/docs/asciidoc/pax-web-dev-guide.adoc b/pax-web-manual/src/docs/asciidoc/pax-web-dev-guide.adoc
@@ -104,7 +104,7 @@ It is important to be aware how it translates to real context managed by target
 
 == Resources
 
-From the perspective of JavaEE web developer, the proper interface to access web resources is `javax.servlet.ServletContext` and its resource accessing methods:
+From the perspective of JakartaEE web developer, the proper interface to access web resources is `javax.servlet.ServletContext` and its resource accessing methods:
 
 * `javax.servlet.ServletContext.getResourcePaths` - a directory listing for entries beginning with the passed argument which is a _base_. The _base_ is a directory directly stored in a WAR, but also a path inside _all_ the `/WEB-INF/lib/\*.jar!/META-INF/resources/`. This method returns _names_ and doesn't restrict access to `/WEB-INF` directory!
 * `javax.servlet.ServletContext.getResource[AsStream]` - this method returns a URL (a stream from it). Passed argument _must_ start with `/` and is a base inside a WAR or a base of each of the `/WEB-INF/lib/\*.jar!/META-INF/resources/`. According to JavaDoc, this method doesn't involve classloaders. Also this method doesn't prevent accessing `/WEB-INF/` or `/META-INF`!

diff --git a/pax-web-resources/pax-web-resources-extender/pom.xml b/pax-web-resources/pax-web-resources-extender/pom.xml
@@ -101,7 +101,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/pax-web-resources/pax-web-resources-jsf/pom.xml b/pax-web-resources/pax-web-resources-jsf/pom.xml
@@ -98,7 +98,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...-web-resources-jsf/src/main/java/org/ops4j/pax/web/resources/jsf/OsgiResourceHandler.java b/...-web-resources-jsf/src/main/java/org/ops4j/pax/web/resources/jsf/OsgiResourceHandler.java
@@ -29,7 +29,7 @@
 import javax.faces.application.ResourceHandlerWrapper;
 import javax.faces.application.ViewResource;
 import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.ops4j.pax.web.resources.api.OsgiResourceLocator;

diff --git a/...rces-jsf/src/main/java/org/ops4j/pax/web/resources/jsf/internal/ResourceHandlerUtils.java b/...rces-jsf/src/main/java/org/ops4j/pax/web/resources/jsf/internal/ResourceHandlerUtils.java
@@ -33,9 +33,9 @@
 import javax.faces.application.ResourceWrapper;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.ops4j.pax.web.resources.jsf.OsgiResource;
 import org.slf4j.Logger;

diff --git a/...rc/main/java/org/ops4j/pax/web/service/undertow/internal/web/UndertowResourceServlet.java b/...rc/main/java/org/ops4j/pax/web/service/undertow/internal/web/UndertowResourceServlet.java
@@ -53,7 +53,7 @@
  * inside the forked version, but if in future, Undertow opens the default servlet more, we could get rid of
  * the fork.</p>
  */
-public class UndertowResourceServlet extends DefaultServlet implements ResourceManager {
+	public class UndertowResourceServlet extends DefaultServlet implements ResourceManager {
 
 	public static final Logger LOG = LoggerFactory.getLogger(UndertowResourceServlet.class);