Jakarta flavor of CXF #5

bootique · Mar 28, 2024 · 6dd848a · 6dd848a
1 parent cbdc238
commit 6dd848a
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 14 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,6 @@
 ## 3.0-M3
 
+* #5 Jakarta flavor of CXF
 * #6 Upgrade CXF 3.x to 3.6.3
 
 ## 2.0.B1

diff --git a/bootique-cxf-jakarta-jaxrs/pom.xml b/bootique-cxf-jakarta-jaxrs/pom.xml
@@ -95,8 +95,8 @@
 
         <!-- Unit test dependencies -->
         <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique-junit5</artifactId>
+            <groupId>io.bootique.jetty</groupId>
+            <artifactId>bootique-jetty-jakarta-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/bootique-cxf-jakarta-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleDefaultIT.java b/bootique-cxf-jakarta-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleDefaultIT.java
@@ -21,6 +21,7 @@
 
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import org.apache.http.HttpResponse;
@@ -36,14 +37,17 @@
 @BQTest
 public class CxfJaxrsModuleDefaultIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .createRuntime();
 
     @Test
     public void response() throws IOException {
-        HttpResponse response = Request.Get("http://localhost:8080/").execute().returnResponse();
+        HttpResponse response = Request.Get(jetty.getUrl()).execute().returnResponse();
 
         assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
         assertEquals("CXF REST API Module", EntityUtils.toString(response.getEntity()));

diff --git a/bootique-cxf-jakarta-jaxws-it/pom.xml b/bootique-cxf-jakarta-jaxws-it/pom.xml
@@ -45,8 +45,8 @@
 
         <!-- Unit test dependencies -->
         <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique-junit5</artifactId>
+            <groupId>io.bootique.jetty</groupId>
+            <artifactId>bootique-jetty-jakarta-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/bootique-cxf-jakarta-jaxws-it/src/test/java/io/bootique/cxf/jaxws/SimpleJavaFirstIT.java b/bootique-cxf-jakarta-jaxws-it/src/test/java/io/bootique/cxf/jaxws/SimpleJavaFirstIT.java
@@ -3,6 +3,7 @@
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
 import io.bootique.cxf.CxfModule;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import jakarta.xml.ws.Endpoint;
@@ -15,9 +16,12 @@
 @BQTest
 public class SimpleJavaFirstIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     static final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .module(b -> {
 
                 CxfModule.extend(b).addFeature(LoggingFeature.class);
@@ -32,7 +36,7 @@ public class SimpleJavaFirstIT {
     public void simpleService() {
 
         JaxWsProxyFactoryBean proxyFactoryBean = new JaxWsProxyFactoryBean();
-        proxyFactoryBean.setAddress("http://localhost:8080/test");
+        proxyFactoryBean.setAddress(jetty.getUrl() + "/test");
         HelloWorld helloWorldClient = proxyFactoryBean.create(HelloWorld.class);
 
         String responseFromClient = helloWorldClient.sayHi("Simple Client");

diff --git a/bootique-cxf-jakarta-jaxws-it/src/test/java/io/bootique/cxf/jaxws/WsdlFirstIT.java b/bootique-cxf-jakarta-jaxws-it/src/test/java/io/bootique/cxf/jaxws/WsdlFirstIT.java
@@ -8,6 +8,7 @@
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
 import io.bootique.cxf.CxfModule;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import org.apache.cxf.ext.logging.LoggingFeature;
@@ -25,9 +26,12 @@
 @BQTest
 public class WsdlFirstIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     static final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .module(binder -> {
                 // adding logging for both client and a server
                 CxfModule.extend(binder).addFeature(LoggingFeature.class);
@@ -45,7 +49,7 @@ public class WsdlFirstIT {
 
     @BeforeAll
     public static void setUp() throws Exception {
-        String wsdlLoc = "http://localhost:8080/test?wsdl";
+        String wsdlLoc = jetty.getUrl() + "/test?wsdl";
         CustomerServiceService service = new CustomerServiceService(new URL(wsdlLoc));
         CLIENT = service.getCustomerServicePort();
     }

diff --git a/bootique-cxf-jaxrs/pom.xml b/bootique-cxf-jaxrs/pom.xml
@@ -115,8 +115,8 @@
 
         <!-- Unit test dependencies -->
         <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique-junit5</artifactId>
+            <groupId>io.bootique.jetty</groupId>
+            <artifactId>bootique-jetty-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleDefaultIT.java b/bootique-cxf-jaxrs/src/test/java/io/bootique/cxf/CxfJaxrsModuleDefaultIT.java
@@ -21,6 +21,7 @@
 
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import org.apache.http.HttpResponse;
@@ -36,14 +37,17 @@
 @BQTest
 public class CxfJaxrsModuleDefaultIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .createRuntime();
 
     @Test
     public void response() throws IOException {
-        HttpResponse response = Request.Get("http://localhost:8080/").execute().returnResponse();
+        HttpResponse response = Request.Get(jetty.getUrl()).execute().returnResponse();
 
         assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
         assertEquals("CXF REST API Module", EntityUtils.toString(response.getEntity()));

diff --git a/bootique-cxf-jaxws-it/pom.xml b/bootique-cxf-jaxws-it/pom.xml
@@ -45,8 +45,8 @@
 
         <!-- Unit test dependencies -->
         <dependency>
-            <groupId>io.bootique</groupId>
-            <artifactId>bootique-junit5</artifactId>
+            <groupId>io.bootique.jetty</groupId>
+            <artifactId>bootique-jetty-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/bootique-cxf-jaxws-it/src/test/java/io/bootique/cxf/jaxws/SimpleJavaFirstIT.java b/bootique-cxf-jaxws-it/src/test/java/io/bootique/cxf/jaxws/SimpleJavaFirstIT.java
@@ -3,6 +3,7 @@
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
 import io.bootique.cxf.CxfModule;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import org.apache.cxf.ext.logging.LoggingFeature;
@@ -16,9 +17,12 @@
 @BQTest
 public class SimpleJavaFirstIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     static final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .module(b -> {
 
                 CxfModule.extend(b).addFeature(LoggingFeature.class);
@@ -33,7 +37,7 @@ public class SimpleJavaFirstIT {
     public void simpleService() {
 
         JaxWsProxyFactoryBean proxyFactoryBean = new JaxWsProxyFactoryBean();
-        proxyFactoryBean.setAddress("http://localhost:8080/test");
+        proxyFactoryBean.setAddress(jetty.getUrl() + "/test");
         HelloWorld helloWorldClient = proxyFactoryBean.create(HelloWorld.class);
 
         String responseFromClient = helloWorldClient.sayHi("Simple Client");

diff --git a/bootique-cxf-jaxws-it/src/test/java/io/bootique/cxf/jaxws/WsdlFirstIT.java b/bootique-cxf-jaxws-it/src/test/java/io/bootique/cxf/jaxws/WsdlFirstIT.java
@@ -8,6 +8,7 @@
 import io.bootique.BQRuntime;
 import io.bootique.Bootique;
 import io.bootique.cxf.CxfModule;
+import io.bootique.jetty.junit5.JettyTester;
 import io.bootique.junit5.BQApp;
 import io.bootique.junit5.BQTest;
 import org.apache.cxf.ext.logging.LoggingFeature;
@@ -25,9 +26,12 @@
 @BQTest
 public class WsdlFirstIT {
 
+    static final JettyTester jetty = JettyTester.create();
+
     @BQApp
     static final BQRuntime app = Bootique.app("-s")
             .autoLoadModules()
+            .module(jetty.moduleReplacingConnectors())
             .module(binder -> {
                 // adding logging for both client and a server
                 CxfModule.extend(binder).addFeature(LoggingFeature.class);
@@ -45,7 +49,7 @@ public class WsdlFirstIT {
 
     @BeforeAll
     public static void setUp() throws Exception {
-        String wsdlLoc = "http://localhost:8080/test?wsdl";
+        String wsdlLoc = jetty.getUrl() + "/test?wsdl";
         CustomerServiceService service = new CustomerServiceService(new URL(wsdlLoc));
         CLIENT = service.getCustomerServicePort();
     }

diff --git a/pom.xml b/pom.xml
@@ -86,6 +86,16 @@
                 <artifactId>bootique-junit5</artifactId>
                 <version>${bootique.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.bootique.jetty</groupId>
+                <artifactId>bootique-jetty-junit5</artifactId>
+                <version>${bootique.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.bootique.jetty</groupId>
+                <artifactId>bootique-jetty-jakarta-junit5</artifactId>
+                <version>${bootique.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>