cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6869] Removing CXFServlet registration in JAX-RS demo SampleRestApplication
Date Fri, 27 May 2016 12:55:42 GMT
Repository: cxf
Updated Branches:
  refs/heads/master f195bdd73 -> e95c92a38


[CXF-6869] Removing CXFServlet registration in JAX-RS demo SampleRestApplication


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e95c92a3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e95c92a3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e95c92a3

Branch: refs/heads/master
Commit: e95c92a38c2cf125e80d36abd7acd682e297dcf5
Parents: f195bdd
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Fri May 27 13:55:26 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Fri May 27 13:55:26 2016 +0100

----------------------------------------------------------------------
 .../main/java/sample/rs/service/SampleRestApplication.java  | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/e95c92a3/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
index 5338ca2..c2cbc7d 100644
--- a/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/jaxrs_spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -22,11 +22,8 @@ import java.util.Arrays;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 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 sample.rs.service.hello1.HelloService;
@@ -39,12 +36,6 @@ public class SampleRestApplication {
     }
  
     @Bean
-    public ServletRegistrationBean servletRegistrationBean(ApplicationContext context) {
-        return new ServletRegistrationBean(new CXFServlet(), "/services/*");
-    }
- 
-    
-    @Bean
     public Server rsServer() {
         JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
         endpoint.setServiceBeans(Arrays.asList(new HelloService(), new HelloService2()));


Mime
View raw message