Jakarta Servlet API transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
index d1423e7..1f79a94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef(wsdlLocation="WEB-INF/wsdl/SubtractNumbers.wsdl") SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/client-handler-1/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
index ca03165..11a38e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/client-handler-2/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
index e605f12..f06c11c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,12 +32,12 @@
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/containerresolver-app2/Hello2Service?wsdl") Hello2Service service2;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
Hello1 port1 = service1.getHello1Port();
String ret = port1.sayHello1("Hi");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
index 8c29780..c8c150d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/dol-override-1/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
index e2ce5da..a326225 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
javax.naming.InitialContext ic = new javax.naming.InitialContext();
Object res = ic.lookup("java:comp/env/MyMappedName");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
index 675e989..168756d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
index 761f980..361a0b7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
int ret = port.subtractNumbers(22222, 11111);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
index 55c1cec..1972c59 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
Hello port = service.getHelloPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
index 16536de..fd7bd60 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
Hello port = service.getHello();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
index 099e3e2..5337236 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
String ret="Oneway works";
try {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
index 5cd8e35..5d8ee12 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
Hello port = service.getHelloPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
index 2c0b5a0..045248a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef(name="service/MyService") AddNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
AddNumbersPortType port = service.getAddNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://localhost:8080/prepkged-svc-1/webservice/AddNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
index 95f597e..1502ffd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
index 65cebee..a51166f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/svchandler-2/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
index 894f360..51277cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/svchandler-3/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
index a9e30f3..4e2b758 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,12 +28,12 @@
@WebServiceRef SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
SubtractNumbersPortType port = service.getSubtractNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/svchandler-4/webservice/SubtractNumbersService?WSDL");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/webclient/Client.java
index 4e82b88..00058a7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/webclient/Client.java
@@ -16,8 +16,8 @@
package webclient;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -35,12 +35,12 @@
SubtractNumbersService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump = true;
SubtractNumbers port2 = service.getSubtractNumbersPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
index 539ccc2..49cd203 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -34,12 +34,12 @@
SubtractNumbersService service2;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
SubtractNumbersImpl port2 = service2.getSubtractNumbersPortType();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
index 2d0d42a..a478d81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,12 +32,12 @@
SubtractNumbersImpl port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
index 5fbce84..55f405f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,12 +32,12 @@
SubtractNumbersImpl port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
int ret = port.subtractNumbers(9999, 4444);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
index 2f8df3c..21087d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,12 +32,12 @@
SubtractNumbersPortType port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
javax.naming.InitialContext ic = new javax.naming.InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
index d991949..2c75f33 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -32,12 +32,12 @@
SubtractNumbersImpl port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
index c1498e8..4af6b43 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
@@ -19,7 +19,7 @@
import jakarta.jws.WebService;
import jakarta.annotation.Resource;
import jakarta.xml.ws.WebServiceContext;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import jakarta.xml.ws.WebServiceContext;
import jakarta.xml.ws.handler.MessageContext;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
index 2a43347..40fc285 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,12 +30,12 @@
Hello port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret = port.sayHello("All");
System.out.println(ret);
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 1bda942..3797941 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
@@ -16,8 +16,8 @@
package webclient;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
import ejbclient.*;
@@ -33,12 +33,12 @@
webclient.Hello hiport2;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret1 = hiport1.sayHello("All");
String ret2 = hiport2.sayHello("All");
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 c73bd01..b263ee0 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
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret = hiport.sayHello("All");
PrintWriter out = resp.getWriter();
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 c73bd01..b263ee0 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
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret = hiport.sayHello("All");
PrintWriter out = resp.getWriter();
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 c73bd01..b263ee0 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
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret = hiport.sayHello("All");
PrintWriter out = resp.getWriter();
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 c73bd01..b263ee0 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
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String ret = hiport.sayHello("All");
PrintWriter out = resp.getWriter();
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 e9d8aae..8052095 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
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -34,12 +34,12 @@
Hello hiport;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
com.sun.xml.ws.transport.http.client.HttpTransportPipe.dump=true;
String ret = hiport.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
index 2acf847..916f52e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
@@ -28,7 +28,7 @@
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
-public class GoogleServletImpl implements javax.servlet.SingleThreadModel, ServiceLifecycle {
+public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
index c5c7a82..b6e2784 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
@@ -16,14 +16,14 @@
package client;
-import javax.servlet.*;
+import jakarta.servlet.*;
import java.io.IOException;
import java.io.PrintWriter;
import javax.naming.InitialContext;
-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 javax.xml.rpc.Stub;
import helloservice.*;
@@ -32,12 +32,12 @@
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc-ejb/hello";//?wsdl
InitialContext ic = new InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
index cee89c5..c712efe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
@@ -16,14 +16,14 @@
package client;
-import javax.servlet.*;
+import jakarta.servlet.*;
import java.io.IOException;
import java.io.PrintWriter;
import javax.naming.InitialContext;
-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 javax.xml.rpc.Stub;
import helloservice.*;
@@ -32,12 +32,12 @@
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc/hello";//?wsdl
InitialContext ic = new InitialContext();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
index 8859575..c6abd3c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
index 81b8d73..e653d46 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
Calculator port = service.getCalculatorPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
index fbc291b..b0c8667 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,12 +30,12 @@
HelloEJBService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
Hello port = service.getHelloEJBPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
index 65b868e..cffbfe9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/adder") AdderService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
index b91f869..08c0656 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
@@ -16,8 +16,8 @@
package myclient;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.Serializable;
import java.io.PrintWriter;
import java.rmi.RemoteException;
@@ -32,18 +32,18 @@
}
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
this.resp = resp;
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try{
this.resp = resp;
calculateInterest();
}catch(Exception e) {
- throw new javax.servlet.ServletException(e);
+ throw new jakarta.servlet.ServletException(e);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
index 9fa9be9..df6620d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
@@ -26,7 +26,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
-import javax.servlet.SingleThreadModel;
+import jakarta.servlet.SingleThreadModel;
public class FindInterestServletImpl implements
SingleThreadModel, ServiceLifecycle {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
index e82f753..67f2288 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
@@ -26,7 +26,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
-import javax.servlet.SingleThreadModel;
+import jakarta.servlet.SingleThreadModel;
public class FindInterestServletImpl implements
SingleThreadModel, ServiceLifecycle {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
index 9fa9be9..df6620d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
@@ -26,7 +26,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.namespace.QName;
-import javax.servlet.SingleThreadModel;
+import jakarta.servlet.SingleThreadModel;
public class FindInterestServletImpl implements
SingleThreadModel, ServiceLifecycle {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
index 2f99d1b..1e8b6aa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,12 +30,12 @@
//static OneWay port;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
index 83bf7a3..89c6f62 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
index 83bf7a3..89c6f62 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,12 +31,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
index 5878654..86fa3e4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
@@ -16,7 +16,7 @@
package client;
-import javax.servlet.http.*;
+import jakarta.servlet.http.*;
import java.io.PrintWriter;
import java.security.Principal;
@@ -30,12 +30,12 @@
HelloEJBService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
Principal p = req.getUserPrincipal();
String principal = (p==null)? "NULL": p.toString();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
index 990d21c..b23c90f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/subtractor") SubtractorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
Subtractor port = service.getSubtractorPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
index fa5fd08..7de5cf6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") AddNumberService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
index 2a6c6da..ed78bcb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
Calculator port = service.getCalculatorPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
index b2578bf..f7bf467 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") EndpointMappingService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
index 6d61707..1778d2b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef EndpointMappingConsumerService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
EndpointMappingConsumer port = service.getEndpointMappingConsumerPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
index e9b33c7..e48a408 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
index 542581f..d185f6f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
index 81b8d73..e653d46 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,12 +29,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
Calculator port = service.getCalculatorPort();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
index 6a56210..ba46619 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
@@ -16,8 +16,8 @@
package client;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.InitialContext;
import jakarta.transaction.UserTransaction;
import java.io.IOException;
@@ -31,12 +31,12 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
UserTransaction ut = null;
try {
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
index 23b01cf..52a6554 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
@@ -17,8 +17,8 @@
package client;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.InitialContext;
import jakarta.transaction.UserTransaction;
import jakarta.transaction.Status;
@@ -37,12 +37,12 @@
@Resource(mappedName="jdbc/__default") private DataSource ds;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm. This name will be used in the EJB
String tableName = "CUSTOMER_cm";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
index a22426d..5d45796 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
@@ -17,8 +17,8 @@
package client;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.InitialContext;
import jakarta.transaction.UserTransaction;
import jakarta.transaction.Status;
@@ -37,12 +37,12 @@
@Resource(mappedName="jdbc/__default") private DataSource ds;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm1. This name will be used in the EJB
String tableName = "CUSTOMER_cm1";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
index 21d02cf..b23f0fb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
@@ -17,8 +17,8 @@
package client;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.InitialContext;
import jakarta.transaction.UserTransaction;
import jakarta.transaction.Status;
@@ -37,12 +37,12 @@
@Resource(mappedName="jdbc/__default") private DataSource ds;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb. This name will be used in the EJB
String tableName = "CUSTOMER_rb";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
index 1dc41ca..44286cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
@@ -17,8 +17,8 @@
package client;
import jakarta.annotation.Resource;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
import javax.naming.InitialContext;
import jakarta.transaction.UserTransaction;
import jakarta.transaction.Status;
@@ -37,12 +37,12 @@
@Resource(mappedName="jdbc/__default") private DataSource ds;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws javax.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb1. This name will be used in the EJB
String tableName = "CUSTOMER_rb1";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
index 3c2c9f0..03f2404 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
@@ -24,7 +24,7 @@
// Service Implementation Class - as outlined in JAX-RPC Specification
-public class HelloImpl implements javax.servlet.SingleThreadModel, ServiceLifecycle {
+public class HelloImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
private boolean gotInit = false;
