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/security/jmac/soap/authmodule/SOAPTestClientAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestClientAuthModule.java
index 955e2f7..212709b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestClientAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestClientAuthModule.java
@@ -25,7 +25,7 @@
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ClientAuthModule;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPTestClientAuthModule implements ClientAuthModule {
private CallbackHandler handler = null;
@@ -46,7 +46,7 @@
Subject clientSubject) throws AuthException {
SOAPMessage reqMessage = (SOAPMessage)messageInfo.getRequestMessage();
QName serviceName = (QName)messageInfo.getMap().get(
- javax.xml.ws.Endpoint.WSDL_SERVICE);
+ jakarta.xml.ws.Endpoint.WSDL_SERVICE);
System.out.println("serviceName = " + serviceName);
if (serviceName == null) {
throw new AuthException("serviceName is null");
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestServerAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestServerAuthModule.java
index dccc935..57b2cd3 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/SOAPTestServerAuthModule.java
@@ -24,7 +24,7 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ServerAuthModule;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPTestServerAuthModule implements ServerAuthModule {
private CallbackHandler handler = null;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/Util.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/Util.java
index 447da8e..52eb053 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/Util.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/authmodule/Util.java
@@ -17,10 +17,10 @@
package com.sun.s1asdev.security.jmac.soap;
import java.io.IOException;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
class Util {
static String getValue(SOAPMessage message) throws SOAPException {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java.template
index 8d1d6f8..8680feb 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java.template
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/Client.java.template
@@ -18,8 +18,8 @@
import java.util.Map;
-import javax.jws.HandlerChain;
-import javax.xml.ws.WebServiceRef;
+import jakarta.jws.HandlerChain;
+import jakarta.xml.ws.WebServiceRef;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
index f566b46..beb0a07 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/client/TestHandler.java
@@ -20,10 +20,10 @@
import java.util.Set;
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/security/jmac/soap/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
index ba7b517..14296fd 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.jmac.soap.ejbws;
import javax.ejb.Stateless;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@Stateless
@WebService(targetNamespace="http://ejbws.soap.jmac.security.s1asdev.sun.com", serviceName="JmacSoapEjbService")
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/servletws/HelloServlet.java
index 6b60bd2..afd6af5 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/servletws/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/servletws/HelloServlet.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soap.servletws;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(targetNamespace="http://servletws.soap.jmac.security.s1asdev.sun.com", serviceName="JmacSoapServletService")
public class HelloServlet {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestClientAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestClientAuthModule.java
index ac848cc..79a1bd4 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestClientAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestClientAuthModule.java
@@ -24,7 +24,7 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ClientAuthModule;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPDefaultTestClientAuthModule implements ClientAuthModule {
private CallbackHandler handler = null;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestServerAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestServerAuthModule.java
index 8e5b6c2..8f3f05e 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/SOAPDefaultTestServerAuthModule.java
@@ -24,7 +24,7 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ServerAuthModule;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPDefaultTestServerAuthModule implements ServerAuthModule {
private CallbackHandler handler = null;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/Util.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/Util.java
index 056dbab..b9f4694 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/Util.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/authmodule/Util.java
@@ -17,10 +17,10 @@
package com.sun.s1asdev.security.jmac.soapdefault;
import java.io.IOException;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
class Util {
static String getValue(SOAPMessage message) throws SOAPException {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java.template b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java.template
index 8b6cfd7..c3427c0 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java.template
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/client/Client.java.template
@@ -18,7 +18,7 @@
import java.util.Map;
-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/security/jmac/soapDefault/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
index 2c14a4e..ec8c068 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.jmac.soapdefault.ejbws;
import javax.ejb.Stateless;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@Stateless
@WebService(targetNamespace="http://ejbws.soapdefault.jmac.security.s1asdev.sun.com", serviceName="JmacSoapDefaultEjbService")
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/servletws/HelloServlet.java
index b5cc0b6..a769f75 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/servletws/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/servletws/HelloServlet.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soapdefault.servletws;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(targetNamespace="http://servletws.soapdefault.jmac.security.s1asdev.sun.com", serviceName="JmacSoapDefaultServletService")
public class HelloServlet {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestClientAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestClientAuthModule.java
index d1deec0..8781e5a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestClientAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestClientAuthModule.java
@@ -25,7 +25,7 @@
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ClientAuthModule;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPEmbeddedTestClientAuthModule implements ClientAuthModule {
private CallbackHandler handler = null;
@@ -46,7 +46,7 @@
Subject clientSubject) throws AuthException {
SOAPMessage reqMessage = (SOAPMessage)messageInfo.getRequestMessage();
QName serviceName = (QName)messageInfo.getMap().get(
- javax.xml.ws.Endpoint.WSDL_SERVICE);
+ jakarta.xml.ws.Endpoint.WSDL_SERVICE);
System.out.println("serviceName = " + serviceName);
if (serviceName == null) {
throw new AuthException("serviceName is null");
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestServerAuthModule.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestServerAuthModule.java
index 578deff..776a9be 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestServerAuthModule.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/SOAPEmbeddedTestServerAuthModule.java
@@ -24,7 +24,7 @@
import javax.security.auth.message.MessageInfo;
import javax.security.auth.message.MessagePolicy;
import javax.security.auth.message.module.ServerAuthModule;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
public class SOAPEmbeddedTestServerAuthModule implements ServerAuthModule {
private CallbackHandler handler = null;
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/Util.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/Util.java
index 89bea16..d66da28 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/Util.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/authmodule/Util.java
@@ -17,10 +17,10 @@
package com.sun.s1asdev.security.jmac.soapembedded;
import java.io.IOException;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPElement;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
class Util {
static String getValue(SOAPMessage message) throws SOAPException {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
index 2748cb8..f2b925b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
@@ -17,7 +17,7 @@
package com.sun.s1asdev.security.jmac.soapembedded.ejbws;
import javax.ejb.Stateless;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@Stateless
@WebService(targetNamespace="http://ejbws.soapembedded.jmac.security.s1asdev.sun.com", serviceName="JmacSoapEmbeddedEjbService")
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/servletws/HelloServlet.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/servletws/HelloServlet.java
index 70c4d2a..08af97b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/servletws/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/servletws/HelloServlet.java
@@ -16,7 +16,7 @@
package com.sun.s1asdev.security.jmac.soapembedded.servletws;
-import javax.jws.WebService;
+import jakarta.jws.WebService;
@WebService(targetNamespace="http://servletws.soapembedded.jmac.security.s1asdev.sun.com", serviceName="JmacSoapEmbeddedServletService")
public class HelloServlet {
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java.template b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java.template
index 37c406a..ff01683 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java.template
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/webclient/Servlet.java.template
@@ -24,7 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceRef;
+import jakarta.xml.ws.WebServiceRef;
import com.sun.s1asdev.security.jmac.soapembedded.ejbws.HelloEjb;
import com.sun.s1asdev.security.jmac.soapembedded.ejbws.JmacSoapEmbeddedEjbService;
