Integrate Metro 3.0.0-M1 - round 1, passing build
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
index 2103218..b92f35b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
@@ -20,9 +20,9 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
index da197b3..a20f8ed 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
index db7df1c..6faea2c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
@@ -21,9 +21,9 @@
import java.util.concurrent.Future;
import javax.ejb.Stateless;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.SayHelloResponse;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
index a4b6fe4..a6aeb45 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/client/Client.java
index ec35e6f..3a84ec3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import java.math.BigInteger;
import endpoint.*;
import java.util.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index 2cbb7ee..bc9115c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -18,7 +18,7 @@
import java.math.BigInteger;
import java.util.*;
-import javax.jws.*;
+import jakarta.jws.*;
import javax.ejb.*;
import javax.persistence.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
index efae8e7..7abf638 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
index 89adf0b..f29a15f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
@@ -17,7 +17,7 @@
package ejb;
import javax.ejb.Stateless;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
index a4b6fe4..a6aeb45 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
index 4ae4e61..86a717c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.ejb.SessionContext;
import javax.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
index 04dad33..1b4927e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
index b93c80c..1bda942 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
@@ -22,14 +22,14 @@
import java.io.PrintWriter;
import ejbclient.*;
import webclient.*;
-import javax.xml.ws.*;
+import jakarta.xml.ws.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(ejbclient.HelloEjbService.class)
+ @jakarta.xml.ws.WebServiceRef(ejbclient.HelloEjbService.class)
ejbclient.Hello hiport1;
- @javax.xml.ws.WebServiceRef(webclient.HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(webclient.HelloService.class)
webclient.Hello hiport2;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
index 8a26e59..cc86c72 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.annotation.Resource;
import javax.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
index 11f79c5..c73bd01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
@@ -21,11 +21,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.ws.*;
+import jakarta.xml.ws.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
index 0d18621..2e855f2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
@@ -16,11 +16,11 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.annotation.Resource;
import javax.ejb.SessionContext;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
@javax.ejb.Stateless
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
index 11f79c5..c73bd01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
@@ -21,11 +21,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.ws.*;
+import jakarta.xml.ws.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index c0dd02f..158c11b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.annotation.Resource;
import javax.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
index 11f79c5..c73bd01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
@@ -21,11 +21,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.ws.*;
+import jakarta.xml.ws.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
index a2b86c4..f8f3489 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.annotation.Resource;
import javax.ejb.SessionContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
index 11f79c5..c73bd01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
@@ -21,11 +21,11 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.ws.*;
+import jakarta.xml.ws.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
index 2a61d1e..1a9944f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.ejb.SessionContext;
import javax.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
index 87191d3..bfbf75c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.ejb.SessionContext;
import javax.annotation.Resource;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
index 77823f1..ac6e3bd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
index 5e51686..c830f08 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
index 6ce187b..0a1ed84 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
index c436f8d..9995186 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
@@ -20,9 +20,9 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
index 518d564..9192c67 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import outsidepkg.RetVal;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
index 548c5da..dadba66 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
@@ -20,9 +20,9 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
index 518d564..9192c67 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import outsidepkg.RetVal;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
index 89adf0b..f29a15f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
@@ -17,7 +17,7 @@
package ejb;
import javax.ejb.Stateless;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
index 85796c7..33f2651 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.*;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
index ad6a557..9837456 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
index 9360ab3..b1f4a16 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
@@ -16,10 +16,10 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
import javax.ejb.SessionContext;
@WebService
@@ -32,7 +32,7 @@
public String sayHello(String who) {
if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
- if (ejbsc.getMessageContext() instanceof javax.xml.ws.handler.MessageContext){
+ if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
//System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
return "WebSvcTest-Hello " + who;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
index f3d9ac1..1818949 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
index 10d87ea..d455c3a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloEJBService;
import endpoint.Hello;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
index b8657e9..dd4b642 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index f6bd0d2..d351616 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -18,11 +18,11 @@
import java.util.Map;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
@@ -46,8 +46,8 @@
//remove once bug is fixed
Exception e = new Exception();
e.printStackTrace();
- if (invCtx.getContextData() instanceof javax.xml.ws.handler.MessageContext){
- System.out.println("ContextDataMap is an instance of javax.xml.ws.handler.MessageContext ");
+ if (invCtx.getContextData() instanceof jakarta.xml.ws.handler.MessageContext){
+ System.out.println("ContextDataMap is an instance of jakarta.xml.ws.handler.MessageContext ");
return invCtx.proceed();
} else {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
index ad6a557..9837456 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
index 0567991..3311b8d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
@@ -16,10 +16,10 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
@WebService
@Stateless
@@ -29,7 +29,7 @@
public String sayHello(String who) {
System.out.println("EJB WSCTXT wsc = " + ejbsc);
- javax.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
+ jakarta.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
if(m == null)
return "WebService Context injection failed";
if(ejbsc != null)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
index 8761c70..2015dec 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
index bf2e8d3..12808a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
@@ -25,10 +25,10 @@
// Service Implementation Class - as outlined in JAX-RPC Specification
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@javax.ejb.Stateless
-@javax.jws.WebService(
+@jakarta.jws.WebService(
serviceName="HttpTestService",
endpointInterface="service.Hello1",
portName="Hello1Port",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
index be1f465..471cecf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
@@ -25,10 +25,10 @@
// Service Implementation Class - as outlined in JAX-RPC Specification
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@javax.ejb.Stateless
-@javax.jws.WebService(
+@jakarta.jws.WebService(
serviceName="HttpTestService",
endpointInterface="service.Hello",
portName="HelloPort",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
index 5180b5b..188105e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
index 4922a0c..29c4421 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloEJBService;
import endpoint.Hello;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
index b8657e9..dd4b642 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
index e7b3cce..37db4a6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
index 4ff80da..5deb6d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloEJBService;
import endpoint.Hello;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
index 9952e92..01cef46 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
@@ -16,9 +16,9 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
-import javax.jws.Oneway;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.Oneway;
@WebService
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
index 432a394..3a971e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
index 907c3a0..7fd8907 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
index 9b30662..7fa7620 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import ejb.GatewayImplService;
import ejb.GatewayImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
index 318023b..974d83c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
@@ -16,11 +16,11 @@
package ejb;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.ejb.Stateless;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
index de53997..0c0651e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
index 4e7c5b4..6706171 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
index 9543838..d265bb5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.jaxws.HelloImplService;
import endpoint.jaxws.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
index 0a58474..b194629 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
@@ -18,19 +18,19 @@
import java.io.*;
import java.util.Map;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.Service ;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.Service ;
+import jakarta.xml.soap.SOAPMessage;
import javax.ejb.Stateless;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.ws.WebServiceException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.ws.WebServiceException;
import endpoint.jaxws.*;
@@ -44,14 +44,14 @@
private int combo;
private int bodyIndex;
- public javax.xml.bind.JAXBContext getJAXBContext(){
+ public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
- private static javax.xml.bind.JAXBContext createJAXBContext(){
+ private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
- return javax.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
- }catch(javax.xml.bind.JAXBException e){
+ return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
+ }catch(jakarta.xml.bind.JAXBException e){
throw new WebServiceException(e.getMessage(), e);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
index 889daf7..f6d7eca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
index 82e236e..97c70ba 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
@@ -22,15 +22,15 @@
import javax.annotation.Resource;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.http.HTTPException;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.BindingType;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.http.HTTPException;
+import jakarta.xml.ws.http.HTTPBinding;
+import jakarta.xml.ws.BindingType;
import javax.ejb.Stateless;
@WebServiceProvider
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
index 9e78167..93137a5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
@@ -17,8 +17,8 @@
package client;
import java.util.Map;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.BindingProvider;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
@@ -63,8 +63,8 @@
if (username!=null && password!=null) {
BindingProvider bd = (BindingProvider) port;
Map<String, Object> requestContext = bd.getRequestContext();
- requestContext.put("javax.xml.ws.security.auth.username",username);
- requestContext.put("javax.xml.ws.security.auth.password",password);
+ requestContext.put("jakarta.xml.ws.security.auth.username",username);
+ requestContext.put("jakarta.xml.ws.security.auth.password",password);
}
// @PermitAll invocation, it should always work
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
index e086057..8a0085e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.security.RolesAllowed;
import javax.annotation.security.DenyAll;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
index 02332e8..03e9b67 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import ejb.GatewayImplService;
import ejb.GatewayImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
index e94c4b8..e7a1fd6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
@@ -16,11 +16,11 @@
package ejb;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
import javax.ejb.Stateless;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
index dbb9d69..a71374b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
index b358abf..daf2dee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
index f4e5705..a495dc4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
@@ -16,10 +16,10 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
import javax.ejb.SessionContext;
import java.security.Principal;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
index ad49e70..8ceb062 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
@@ -20,9 +20,9 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
index 5887e9c..c4f2804 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Singleton;
import outsidepkg.RetVal;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
index 4f40d11..46618ec 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloEJBService;
import endpoint.Hello;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
index b8657e9..dd4b642 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
index c447846..d0c8771 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
@@ -16,12 +16,12 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService(endpointInterface="endpoint.Hello")
@Stateless
-@javax.jws.HandlerChain(name="some name", file="META-INF/myhandler.xml")
+@jakarta.jws.HandlerChain(name="some name", file="META-INF/myhandler.xml")
public class HelloEJB implements Hello {
public String sayHello(String who) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
index 41508fb..c4946cc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
@@ -22,10 +22,10 @@
import javax.annotation.Resource;
import javax.annotation.PostConstruct;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.soap.*;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
index c4edf73..4d30eb5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
@@ -16,8 +16,8 @@
package endpoint;
-import javax.jws.WebService;
-import javax.jws.WebMethod;
+import jakarta.jws.WebService;
+import jakarta.jws.WebMethod;
@javax.ejb.Stateless
@WebService(
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
index b6aa70c..e9d8aae 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
@@ -21,12 +21,12 @@
import java.io.IOException;
import java.io.PrintWriter;
-import javax.xml.ws.*;
-import javax.xml.ws.soap.*;
+import jakarta.xml.ws.*;
+import jakarta.xml.ws.soap.*;
public class Client extends HttpServlet {
- @javax.xml.ws.WebServiceRef(HelloService.class)
+ @jakarta.xml.ws.WebServiceRef(HelloService.class)
@MTOM(enabled=true)
@RespectBinding
@Addressing (required = false,enabled=true)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
index 54380b3..89ad876 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloImplService;
import endpoint.HelloImpl;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
index c351006..0dc1359 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
@@ -16,10 +16,10 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
import javax.ejb.SessionContext;
@WebService
@@ -34,7 +34,7 @@
System.out.println("EJB WSCTXT wsc = " + ejbsc);
if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
-if (ejbsc.getMessageContext() instanceof javax.xml.ws.handler.MessageContext){
+if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
}
else {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
index 0e49e37..7c86441 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import endpoint.HelloEJBService;
import endpoint.Hello;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
index b8657e9..dd4b642 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService
public interface Hello {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index 0b9a462..fd61fdb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -18,11 +18,11 @@
import java.util.Map;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceContext;
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
index 97d19bd..7e37fcf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
@@ -20,9 +20,9 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
+import jakarta.xml.ws.WebServiceRef;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Response;
import endpoint.*;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
index 49ee427..e502ee5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
import javax.ejb.Stateless;
@WebService(name="ThisShouldBeIgnored")
