Skip to content

Commit

Permalink
[#1802] Switch pax-web-itest-utils from javax to jakarta
Browse files Browse the repository at this point in the history
  • Loading branch information
@grgrzybek
grgrzybek committed Jun 21, 2023
1 parent b9f3e03 commit 0f5d4da
Show file tree
Hide file tree
Showing 22 changed files with 131 additions and 125 deletions.
34 changes: 20 additions & 14 deletions pax-web-itest/pax-web-itest-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,33 @@
<configuration>
<instructions>
<Import-Package>
<!-- ranges indicate Servlet API 3.1+ (JavaEE 7+) -->
javax.servlet;version="[3.1,5)",
javax.servlet.annotation;version="[3.1,5)",
javax.servlet.http;version="[3.1,5)",
javax.websocket;resolution:=optional,
javax.websocket.server;resolution:=optional,

<!-- ranges indicate we can work with OSGi Core R6+ -->
org.osgi.framework;version="[1.8,2)",
<!-- ranges indicate Servlet API 6.0+ (JakartaEE 10+) -->
jakarta.servlet;version="[6,7)",
jakarta.servlet.annotation;version="[6,7)",
jakarta.servlet.http;version="[6,7)",

jakarta.websocket;version="[2.1,3)",
jakarta.websocket.server;version="[2.1,3)",

<!-- OSGi Core R8+ -->
org.osgi.framework;version="[1.10,2)",
org.osgi.framework.wiring;version="[1.2,2)",
org.osgi.util.tracker;version="[1.5,2)",

<!-- from pax-web-api -->
org.ops4j.pax.web.service;version="${pax-web.osgi.version}",

<!-- from pax-logging-api -->
org.slf4j;version="[1.7,2)",
org.slf4j;version="[2,3)",

<!-- other -->
javax.net,
javax.net.ssl,
javax.security.auth.x500
</Import-Package>
<Dynamic-ImportPackage>
javax.websocket,
javax.websocket.*
jakarta.websocket,
jakarta.websocket.*
</Dynamic-ImportPackage>
<Export-Package>
org.ops4j.pax.web.itest.utils.*,
Expand Down Expand Up @@ -124,11 +125,11 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<artifactId>org.osgi.service.servlet</artifactId>
<scope>provided</scope>
</dependency>

<!-- JavaEE -->
<!-- JakartaEE -->

<dependency>
<groupId>jakarta.servlet</groupId>
Expand All @@ -140,6 +141,11 @@
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-client-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Logging -->

Expand Down
14 changes: 7 additions & 7 deletions ...-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedMultipartTestServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.MultipartConfig;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.Part;

@WebServlet(value = "/multipartest", name = "multipartest")
@MultipartConfig(
Expand Down
14 changes: 7 additions & 7 deletions ...-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedTestFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
import java.io.IOException;
import java.net.URL;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.annotation.WebFilter;

@WebFilter(value = "/*")
public class AnnotatedTestFilter implements Filter {
Expand Down
12 changes: 6 additions & 6 deletions ...web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AnnotatedTestServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
16 changes: 8 additions & 8 deletions ...test/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AsyncFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.annotation.WebFilter;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.annotation.WebFilter;
import jakarta.servlet.http.HttpServletResponse;

@WebFilter(asyncSupported = true)
public class AsyncFilter implements Filter {
Expand Down
12 changes: 6 additions & 6 deletions ...est/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/AsyncServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import java.util.Arrays;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import javax.servlet.AsyncContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

@WebServlet(asyncSupported = true)
public class AsyncServlet extends HttpServlet {
Expand Down
12 changes: 6 additions & 6 deletions ...st/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/BrokenServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Dictionary;
import java.util.Hashtable;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;

public class BrokenServlet extends HttpServlet {

Expand Down
6 changes: 3 additions & 3 deletions ...pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Activator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

import java.util.Dictionary;
import java.util.Hashtable;
import javax.servlet.Filter;
import javax.servlet.Servlet;
import jakarta.servlet.Filter;
import jakarta.servlet.Servlet;

import org.ops4j.pax.web.service.PaxWebConstants;
import org.ops4j.pax.web.service.WebContainer;
import org.ops4j.pax.web.service.http.HttpContext;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.http.HttpContext;

public class Bundle1Activator implements BundleActivator {

Expand Down
12 changes: 6 additions & 6 deletions ...st/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Filter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
8 changes: 4 additions & 4 deletions ...t/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1Servlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
12 changes: 6 additions & 6 deletions ...-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle1SharedFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
12 changes: 6 additions & 6 deletions ...-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle2SharedFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
8 changes: 4 additions & 4 deletions ...web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/Bundle2SharedServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
12 changes: 6 additions & 6 deletions ...est/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/ErrorServlet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import java.io.IOException;
import java.util.Dictionary;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.Servlet;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Expand Down
2 changes: 1 addition & 1 deletion ...eb-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/FilterBundleActivator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package org.ops4j.pax.web.itest.utils.web;

import java.util.Hashtable;
import javax.servlet.Filter;
import jakarta.servlet.Filter;

import org.ops4j.pax.web.service.PaxWebConstants;
import org.osgi.framework.BundleActivator;
Expand Down
2 changes: 1 addition & 1 deletion ...b-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/ServletBundleActivator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package org.ops4j.pax.web.itest.utils.web;

import java.util.Hashtable;
import javax.servlet.Servlet;
import jakarta.servlet.Servlet;

import org.ops4j.pax.web.service.PaxWebConstants;
import org.ops4j.pax.web.service.WebContainer;
Expand Down
12 changes: 6 additions & 6 deletions ...est/pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/SimpleFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import java.io.IOException;
import java.net.URL;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;

public class SimpleFilter implements Filter {

Expand Down
14 changes: 7 additions & 7 deletions ...pax-web-itest-utils/src/main/java/org/ops4j/pax/web/itest/utils/web/SimpleOnlyFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
package org.ops4j.pax.web.itest.utils.web;

import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;

public class SimpleOnlyFilter implements Filter {

Expand Down

0 comments on commit 0f5d4da

Please sign in to comment.