From a77e97defe537dfb8cf5ef3448c1b4117d08ab26 Mon Sep 17 00:00:00 2001 From: Ryan Doherty Date: Fri, 3 May 2024 15:34:06 -0400 Subject: [PATCH] Jakarta namespace changes --- .../org/gusdb/wsf/client/WsfRemoteClient.java | 12 ++++++------ .../org/gusdb/wsf/client/MockPluginTest.java | 2 +- .../java/org/gusdb/wsf/service/WsfService.java | 18 +++++++++--------- .../wsf/service/WsfServiceApplication.java | 2 +- .../org/gusdb/wsf/service/MockServiceTest.java | 2 +- Service/webapp/WEB-INF/wsf-web.xml | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Client/src/main/java/org/gusdb/wsf/client/WsfRemoteClient.java b/Client/src/main/java/org/gusdb/wsf/client/WsfRemoteClient.java index efe92c51f..6518bbcaf 100644 --- a/Client/src/main/java/org/gusdb/wsf/client/WsfRemoteClient.java +++ b/Client/src/main/java/org/gusdb/wsf/client/WsfRemoteClient.java @@ -13,12 +13,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.log4j.Logger; import org.glassfish.jersey.client.ClientProperties; diff --git a/Client/src/test/java/org/gusdb/wsf/client/MockPluginTest.java b/Client/src/test/java/org/gusdb/wsf/client/MockPluginTest.java index 13087daca..571327aca 100644 --- a/Client/src/test/java/org/gusdb/wsf/client/MockPluginTest.java +++ b/Client/src/test/java/org/gusdb/wsf/client/MockPluginTest.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Random; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.jetty.server.Server; import org.glassfish.jersey.jetty.JettyHttpContainerFactory; diff --git a/Service/src/main/java/org/gusdb/wsf/service/WsfService.java b/Service/src/main/java/org/gusdb/wsf/service/WsfService.java index 73a240031..390b026b7 100644 --- a/Service/src/main/java/org/gusdb/wsf/service/WsfService.java +++ b/Service/src/main/java/org/gusdb/wsf/service/WsfService.java @@ -4,15 +4,15 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.StreamingOutput; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.StreamingOutput; import org.apache.log4j.Logger; import org.gusdb.wsf.common.ResponseStatus; diff --git a/Service/src/main/java/org/gusdb/wsf/service/WsfServiceApplication.java b/Service/src/main/java/org/gusdb/wsf/service/WsfServiceApplication.java index 77f566321..7c68adce5 100644 --- a/Service/src/main/java/org/gusdb/wsf/service/WsfServiceApplication.java +++ b/Service/src/main/java/org/gusdb/wsf/service/WsfServiceApplication.java @@ -3,7 +3,7 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; public class WsfServiceApplication extends Application { diff --git a/Service/src/test/java/org/gusdb/wsf/service/MockServiceTest.java b/Service/src/test/java/org/gusdb/wsf/service/MockServiceTest.java index 99c69d2de..a8d10e40e 100644 --- a/Service/src/test/java/org/gusdb/wsf/service/MockServiceTest.java +++ b/Service/src/test/java/org/gusdb/wsf/service/MockServiceTest.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Random; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.gusdb.wsf.common.WsfRequest; import org.gusdb.wsf.plugin.DelayedResultException; diff --git a/Service/webapp/WEB-INF/wsf-web.xml b/Service/webapp/WEB-INF/wsf-web.xml index 1d7afafa8..4e89138fb 100644 --- a/Service/webapp/WEB-INF/wsf-web.xml +++ b/Service/webapp/WEB-INF/wsf-web.xml @@ -11,7 +11,7 @@ Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> WSF org.glassfish.jersey.servlet.ServletContainer - javax.ws.rs.Application + jakarta.ws.rs.Application org.gusdb.wsf.service.WsfServiceApplication