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] Improve SpringBoot autoconfiguration, patch from Vedran Pavic applied with thanks
Date Mon, 30 May 2016 12:29:13 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3c804f7dd -> 92cfeea1e


[CXF-6869] Improve SpringBoot autoconfiguration, patch from Vedran Pavic applied with thanks


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

Branch: refs/heads/3.1.x-fixes
Commit: 92cfeea1e557ff870795b5ac7a5699db431efae9
Parents: 3c804f7
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon May 30 13:26:55 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon May 30 13:28:56 2016 +0100

----------------------------------------------------------------------
 .../cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/92cfeea1/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
index 1ff70a6..84be88f 100644
--- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
+++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
@@ -41,8 +41,7 @@ import org.springframework.context.annotation.ImportResource;
  */
 @Configuration
 @ConditionalOnWebApplication
-@ConditionalOnClass(CXFServlet.class)
-@ConditionalOnMissingBean(SpringBus.class)
+@ConditionalOnClass({ SpringBus.class, CXFServlet.class })
 @EnableConfigurationProperties(CxfProperties.class)
 @AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class)
 public class CxfAutoConfiguration {
@@ -51,7 +50,8 @@ public class CxfAutoConfiguration {
     private CxfProperties properties;
 
     @Bean
-    public ServletRegistrationBean messageDispatcherServlet() {
+    @ConditionalOnMissingBean(name = "cxfServletRegistration")
+    public ServletRegistrationBean cxfServletRegistration() {
         String path = this.properties.getPath();
         String urlMapping = path.endsWith("/") ? path + "*" : path + "/*";
         ServletRegistrationBean registration = new ServletRegistrationBean(
@@ -65,8 +65,9 @@ public class CxfAutoConfiguration {
     }
 
     @Configuration
+    @ConditionalOnMissingBean(SpringBus.class)
     @ImportResource("classpath:META-INF/cxf/cxf.xml")
-    protected static class CxfConfiguration {
+    protected static class SpringBusConfiguration {
 
     }
 


Mime
View raw message