diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloService.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloService.java index 64a1e7f53..deff7cdb5 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloService.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloService.java @@ -18,13 +18,13 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws4429; -import jakarta.jws.WebMethod; -import jakarta.jws.WebParam; -import jakarta.jws.WebResult; -import jakarta.jws.WebService; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.ws.RequestWrapper; -import jakarta.xml.ws.ResponseWrapper; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; @WebService(name = "HelloServiceService", targetNamespace = "http://com.redhat.gss.example.soap/") @XmlSeeAlso({ diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceImpl.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceImpl.java index 6bac0ecbf..ceb02309d 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceImpl.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceImpl.java @@ -18,10 +18,10 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws4429; -import jakarta.ejb.Stateless; -import jakarta.jws.HandlerChain; -import jakarta.jws.WebMethod; -import jakarta.jws.WebService; +import javax.ejb.Stateless; +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; @Stateless //@WebService(targetNamespace ="http://com.redhat.gss.example.soap/") // correct targetNamespace diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceService.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceService.java index d8114f74a..b09584f48 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceService.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/HelloServiceService.java @@ -20,10 +20,10 @@ import java.net.URL; import javax.xml.namespace.QName; -import jakarta.xml.ws.Service; -import jakarta.xml.ws.WebEndpoint; -import jakarta.xml.ws.WebServiceClient; -import jakarta.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; @WebServiceClient(name = "HelloServiceService", targetNamespace = "http://com.redhat.gss.example.soap/", wsdlLocation = "HelloServiceService.wsdl") public class HelloServiceService @@ -49,7 +49,7 @@ public HelloService getHelloServicePort() { /** * * @param features - * A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. * @return * returns HelloService */ diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/JBWS4429TestCase.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/JBWS4429TestCase.java index c0ce5a792..3a76839d3 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/JBWS4429TestCase.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/JBWS4429TestCase.java @@ -20,7 +20,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit5.ArquillianExtension; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.FileAsset; @@ -28,14 +28,14 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; import java.io.File; import java.net.URL; -@ExtendWith(ArquillianExtension.class) +@RunWith(Arquillian.class) public class JBWS4429TestCase extends JBossWSTest { private static final String DEP = "jaxws-cxf-jbws4429"; @@ -61,9 +61,9 @@ public void testWS() throws Exception { HelloService service = clientService.getHelloServicePort(); try { service.sayHello("Jim"); - Assertions.fail("sayHello() call should fail"); + Assert.fail("sayHello() call should fail"); } catch (Exception e) { - Assertions.assertEquals("JBWS024118: BindingOperation is missing for authorization", e.getMessage()); + Assert.assertEquals("JBWS024118: BindingOperation is missing for authorization", e.getMessage()); } } diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/LoggingHandler.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/LoggingHandler.java index acd9933d7..4de4f354e 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/LoggingHandler.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/LoggingHandler.java @@ -19,9 +19,9 @@ package org.jboss.test.ws.jaxws.cxf.jbws4429; import javax.xml.namespace.QName; -import jakarta.xml.ws.handler.MessageContext; -import jakarta.xml.ws.handler.soap.SOAPHandler; -import jakarta.xml.ws.handler.soap.SOAPMessageContext; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; import java.util.Collections; import java.util.Set; diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/ObjectFactory.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/ObjectFactory.java index df232d242..fb659294a 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/ObjectFactory.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/ObjectFactory.java @@ -17,9 +17,9 @@ * under the License. */ package org.jboss.test.ws.jaxws.cxf.jbws4429; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlElementDecl; -import jakarta.xml.bind.annotation.XmlRegistry; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHello.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHello.java index 75f153a6b..747964d73 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHello.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHello.java @@ -18,9 +18,9 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws4429; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; /** diff --git a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHelloResponse.java b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHelloResponse.java index 54283af07..0d3046284 100644 --- a/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHelloResponse.java +++ b/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/SayHelloResponse.java @@ -18,7 +18,7 @@ */ package org.jboss.test.ws.jaxws.cxf.jbws4429; -import jakarta.xml.bind.annotation.*; +import javax.xml.bind.annotation.*; /** diff --git a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws4429/WEB-INF/wsdl/HelloService.wsdl b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws4429/WEB-INF/wsdl/HelloService.wsdl index f317f2c3c..48a347eae 100644 --- a/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws4429/WEB-INF/wsdl/HelloService.wsdl +++ b/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws4429/WEB-INF/wsdl/HelloService.wsdl @@ -50,7 +50,7 @@ - + - \ No newline at end of file +