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 11:34:06 UTC
cxf git commit: Making sure JaxRsConfig does not affect CXF Spring
Boot AutoConfigure feature, patch from Vedran Pavic applied with thanks
Repository: cxf
Updated Branches:
refs/heads/master fc8b74975 -> 8e58f887c
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/8e58f887
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e58f887
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e58f887
Branch: refs/heads/master
Commit: 8e58f887ca473e642985e21d0c66c28695f587b3
Parents: fc8b749
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon May 30 12:32:30 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon May 30 12:33:50 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/8e58f887/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/8e58f887/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 {
}