You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/05/30 12:27:10 UTC
cxf git commit: [CXF-6869] Improve SpringBoot autoconfiguration,
patch from Vedran Pavic applied with thanks
Repository: cxf
Updated Branches:
refs/heads/master 4b0868a8e -> 3615f2099
[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/3615f209
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3615f209
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3615f209
Branch: refs/heads/master
Commit: 3615f2099c98ca367e0ea745a4e2c62b7399a47b
Parents: 4b0868a
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon May 30 13:26:55 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon May 30 13:26:55 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/3615f209/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 {
}