Repository: cxf Updated Branches: refs/heads/master 3ae986b30 -> bee2c0d84
Minor update to the jaxrs spring boot demo Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bee2c0d8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bee2c0d8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bee2c0d8 Branch: refs/heads/master Commit: bee2c0d849c4cffd396eaafbe710ddfb499c7a18 Parents: 3ae986b Author: Sergey Beryozkin <[email protected]> Authored: Fri Jul 3 11:11:46 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Jul 3 11:11:46 2015 +0100 ---------------------------------------------------------------------- .../src/main/release/samples/jax_rs/jaxrs_spring_boot/README | 2 +- .../main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml | 2 +- .../main/java/sample/rs/service/SampleRestWSApplication.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bee2c0d8/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README index 68ebb93..5b8fb60 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/README @@ -10,7 +10,7 @@ $ mvn spring-boot:run ---- http://localhost:8080/services/helloservice/sayHello/ApacheCxfUser will now display the output in the browser -like "Hello Elan, Welcome to CXF RS Spring Boot World!!!" +like "Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!" To run the client from a command line open a new terminal window and run: http://git-wip-us.apache.org/repos/asf/cxf/blob/bee2c0d8/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml index 7a208f1..0459dfa 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/pom.xml @@ -102,7 +102,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <configuration> - <mainClass>sample.rs.service.SampleRestWsApplication</mainClass> + <mainClass>sample.rs.service.SampleRestWSApplication</mainClass> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/cxf/blob/bee2c0d8/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java index a47b66c..056cf56 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestWSApplication.java @@ -20,6 +20,7 @@ package sample.rs.service; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; +import org.apache.cxf.jaxrs.spring.JaxRsConfig; import org.apache.cxf.transport.servlet.CXFServlet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; @@ -30,11 +31,10 @@ import org.springframework.boot.context.web.SpringBootServletInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; +import org.springframework.context.annotation.Import; -@Configuration @EnableAutoConfiguration -@ImportResource({ "classpath:META-INF/cxf/cxf.xml" }) +@Import(JaxRsConfig.class) public class SampleRestWSApplication extends SpringBootServletInitializer { @Autowired @@ -65,4 +65,4 @@ public class SampleRestWSApplication extends SpringBootServletInitializer { return application.sources(SampleRestWSApplication.class); } -} \ No newline at end of file +}
