cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [cxf] branch master updated: CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/spring_boot
Date Fri, 23 Nov 2018 03:18:08 GMT
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 05d6d13  CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing
jax_rs/spring_boot
05d6d13 is described below

commit 05d6d134e781481ac1b2297932afe0eb1d4f0c6e
Author: reta <drreta@gmail.com>
AuthorDate: Thu Nov 22 22:17:42 2018 -0500

    CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/spring_boot
---
 .../src/main/java/sample/rs/client/SampleRestClientApplication.java    | 2 +-
 .../src/main/java/sample/rs/service/{ => api}/HelloService.java        | 2 +-
 .../src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java      | 2 +-
 .../src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java      | 3 ++-
 .../jax_rs/spring_boot/src/main/resources/application.properties       | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 14d086e..9afae57 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.Bean;
 
-import sample.rs.service.HelloService;
+import sample.rs.service.api.HelloService;
 
 @SpringBootApplication
 @EnableJaxRsWebClient
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
similarity index 97%
rename from distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
rename to distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
index eb3678f..ccc58d7 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/api/HelloService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package sample.rs.service;
+package sample.rs.service.api;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
index 06a5dd9..cb1f7bb 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
@@ -18,7 +18,7 @@
  */
 package sample.rs.service.hello1;
 
-import sample.rs.service.HelloService;
+import sample.rs.service.api.HelloService;
 
 public class HelloServiceImpl1 implements HelloService {
 
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 91edae0..8943703 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -19,7 +19,8 @@
 package sample.rs.service.hello2;
 
 import javax.ws.rs.Path;
-import sample.rs.service.HelloService;
+
+import sample.rs.service.api.HelloService;
 
 @Path("/sayHello2")
 public class HelloServiceImpl2 implements HelloService {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/resources/application.properties
b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/resources/application.properties
index 90e32e8..d9993d1 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/resources/application.properties
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 cxf.path=/services/helloservice
 cxf.jaxrs.client.address=http://localhost:8080/services/helloservice
 cxf.jaxrs.client.headers.accept=text/plain
-cxf.jaxrs.client.classes-scan-packages=sample.rs.service
+cxf.jaxrs.client.classes-scan-packages=sample.rs.service.api


Mime
View raw message