From 5de253c90ef846ba62b613c07cea955faef5902c Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Tue, 2 Jun 2020 23:54:36 +0200
Subject: [PATCH] fix forgotten references to javax.servlet

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../testcases/bugs/jaxws1044/server/CookieAService.java     | 6 +++---
 .../provider/servlet_parameter_507/server/HelloImpl.java    | 2 +-
 .../http_multi_cookie_servlet/server/HelloServiceImpl.java  | 4 ++--
 .../testcases/server/http_only/server/HelloServiceImpl.java | 4 ++--
 .../session_ignorecase_834/server/HelloServiceImpl.java     | 5 ++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/jaxws-ri/tests/unit/testcases/bugs/jaxws1044/server/CookieAService.java b/jaxws-ri/tests/unit/testcases/bugs/jaxws1044/server/CookieAService.java
index ade7746d3..10cbbcac7 100644
--- a/jaxws-ri/tests/unit/testcases/bugs/jaxws1044/server/CookieAService.java
+++ b/jaxws-ri/tests/unit/testcases/bugs/jaxws1044/server/CookieAService.java
@@ -12,9 +12,9 @@
 
 import jakarta.annotation.Resource;
 import jakarta.jws.WebService;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.xml.ws.WebServiceContext;
 import jakarta.xml.ws.handler.MessageContext;
 import java.util.logging.Logger;
diff --git a/jaxws-ri/tests/unit/testcases/provider/servlet_parameter_507/server/HelloImpl.java b/jaxws-ri/tests/unit/testcases/provider/servlet_parameter_507/server/HelloImpl.java
index 9d94af0e3..163cd6ecd 100644
--- a/jaxws-ri/tests/unit/testcases/provider/servlet_parameter_507/server/HelloImpl.java
+++ b/jaxws-ri/tests/unit/testcases/provider/servlet_parameter_507/server/HelloImpl.java
@@ -16,7 +16,7 @@
 import jakarta.xml.ws.*;
 import jakarta.xml.ws.handler.MessageContext;
 import java.io.ByteArrayInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Client sends form request in the POST request.
diff --git a/jaxws-ri/tests/unit/testcases/server/http_multi_cookie_servlet/server/HelloServiceImpl.java b/jaxws-ri/tests/unit/testcases/server/http_multi_cookie_servlet/server/HelloServiceImpl.java
index 18b0670f5..a3bcb8a3b 100644
--- a/jaxws-ri/tests/unit/testcases/server/http_multi_cookie_servlet/server/HelloServiceImpl.java
+++ b/jaxws-ri/tests/unit/testcases/server/http_multi_cookie_servlet/server/HelloServiceImpl.java
@@ -12,8 +12,8 @@
 
 import jakarta.annotation.Resource;
 import jakarta.jws.WebService;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.xml.ws.WebServiceContext;
 import jakarta.xml.ws.WebServiceException;
 import jakarta.xml.ws.handler.MessageContext;
diff --git a/jaxws-ri/tests/unit/testcases/server/http_only/server/HelloServiceImpl.java b/jaxws-ri/tests/unit/testcases/server/http_only/server/HelloServiceImpl.java
index 47d996f03..d263c7ca2 100644
--- a/jaxws-ri/tests/unit/testcases/server/http_only/server/HelloServiceImpl.java
+++ b/jaxws-ri/tests/unit/testcases/server/http_only/server/HelloServiceImpl.java
@@ -18,8 +18,8 @@
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebService;
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
 
 import jakarta.xml.ws.handler.MessageContext;
 import jakarta.xml.ws.WebServiceException;
diff --git a/jaxws-ri/tests/unit/testcases/server/session_ignorecase_834/server/HelloServiceImpl.java b/jaxws-ri/tests/unit/testcases/server/session_ignorecase_834/server/HelloServiceImpl.java
index 9e068ec82..3b0d93292 100644
--- a/jaxws-ri/tests/unit/testcases/server/session_ignorecase_834/server/HelloServiceImpl.java
+++ b/jaxws-ri/tests/unit/testcases/server/session_ignorecase_834/server/HelloServiceImpl.java
@@ -18,11 +18,10 @@
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebService;
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
 
 import jakarta.xml.ws.handler.MessageContext;
-import jakarta.xml.ws.WebServiceException;
 import jakarta.xml.ws.WebServiceContext;
 
 /**