Update jakarta to javax in test cases for jbossws-cxf-5.4.x branch

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({

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

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 <code>features</code> parameter will have their default values.
+     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
      * @return
      *     returns HelloService
      */

modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws4429/JBWS4429TestCase.java

@@ -20,22 +20,22 @@
 
 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;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 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());
         }
 
     }

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;
 

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;
 
 

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;
 
 
 /**

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.*;
 
 
 /**

modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws4429/WEB-INF/wsdl/HelloService.wsdl

@@ -50,7 +50,7 @@
 </wsdl:binding>
 <wsdl:service name="HelloServiceService">
     <wsdl:port binding="tns:HelloServiceServiceSoapBinding" name="HelloServicePort">
-        <soap:address location="http://@jboss.bind.address@:@cxf-tests.jboss_8080@/jaxws-cxf-jbws4429/HelloServiceImpl"/>
+        <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.cxf-tests.jboss,8080)@/jaxws-cxf-jbws4429/HelloServiceImpl"/>
     </wsdl:port>
 </wsdl:service>
-</wsdl:definitions>
+</wsdl:definitions>