Repository: cxf Updated Branches: refs/heads/master 3d7ff85e2 -> 565319f27
[CXF-6869] Starting experimenting with the new modules Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/565319f2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/565319f2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/565319f2 Branch: refs/heads/master Commit: 565319f277e65ebdb9dc0e950f95b865f7939d53 Parents: 3d7ff85 Author: Sergey Beryozkin <[email protected]> Authored: Mon May 9 17:06:18 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Mon May 9 17:06:18 2016 +0100 ---------------------------------------------------------------------- .../release/samples/jax_rs/jaxrs_spring_boot/pom.xml | 12 ++---------- .../sample/rs/service/SampleScanRestApplication.java | 6 ------ 2 files changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/565319f2/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 137fabe..5f1395e 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 @@ -23,20 +23,15 @@ <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <artifactId>cxf-spring-boot-starter-jax-rs</artifactId> <version>${cxf.version}</version> </dependency> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-service-description</artifactId> @@ -70,9 +65,6 @@ <mainClass>sample.rs.service.SampleRestApplication</mainClass> --> <mainClass>sample.rs.service.SampleScanRestApplication</mainClass> - <!-- - <mainClass>sample.rs.service.SampleScanRestApplication2</mainClass> - --> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/cxf/blob/565319f2/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java index d97de58..9f79c23 100644 --- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java +++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleScanRestApplication.java @@ -19,10 +19,8 @@ package sample.rs.service; import org.apache.cxf.jaxrs.spring.SpringComponentScanServer; import org.apache.cxf.jaxrs.swagger.Swagger2Feature; -import org.apache.cxf.transport.servlet.CXFServlet; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.embedded.ServletRegistrationBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; @@ -35,10 +33,6 @@ public class SampleScanRestApplication { } @Bean - public ServletRegistrationBean servletRegistrationBean(ApplicationContext context) { - return new ServletRegistrationBean(new CXFServlet(), "/services/helloservice/*"); - } - @Bean public Swagger2Feature swaggerFeature(ApplicationContext context) { // Or create a simple Swagger2Feature @Component-annotated extension // and drop this method if a default feature setup is OK
