cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Making sure JaxRsConfig does not affect CXF Spring Boot AutoConfigure feature, patch from Vedran Pavic applied with thanks
Date Mon, 30 May 2016 11:36:21 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 97b9f4e33 -> dfa36ecb1


Making sure JaxRsConfig does not affect CXF Spring Boot AutoConfigure feature, 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/dfa36ecb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dfa36ecb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dfa36ecb

Branch: refs/heads/3.1.x-fixes
Commit: dfa36ecb161fc0e7121aff68ad41ed969307d4f0
Parents: 97b9f4e
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon May 30 12:32:30 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon May 30 12:34:54 2016 +0100

----------------------------------------------------------------------
 .../cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java       | 2 --
 .../src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java     | 2 --
 2 files changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/dfa36ecb/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
index bf37436..c1e5d60 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringConfigurationFactory.java
@@ -29,9 +29,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Import;
 
-@Import(JaxRsConfig.class)
 public abstract class AbstractSpringConfigurationFactory 
     extends AbstractBasicInterceptorProvider implements ApplicationContextAware {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/dfa36ecb/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java
index 2160033..35f47a5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JaxRsConfig.java
@@ -18,10 +18,8 @@
  */
 package org.apache.cxf.jaxrs.spring;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 
-@Configuration
 @ImportResource({"classpath:META-INF/cxf/cxf.xml" })
 public class JaxRsConfig {
 }


Mime
View raw message