You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/01/06 19:54:41 UTC
[9/9] git commit: Haven't supported CXF 2.3.x for a really long time
Haven't supported CXF 2.3.x for a really long time
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b2c650f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b2c650f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b2c650f
Branch: refs/heads/master
Commit: 0b2c650fdbab58dba9f860887b8691d1604a8970
Parents: bc4b400
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jan 6 12:56:21 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jan 6 12:56:21 2014 -0500
----------------------------------------------------------------------
.../apache/camel/component/cxf/CxfSpringEndpoint.java | 14 +-------------
.../cxf/spring/SpringJAXRSClientFactoryBean.java | 14 +-------------
.../cxf/spring/SpringJAXRSServerFactoryBean.java | 14 +-------------
3 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0b2c650f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
index 39558b1..dc4e662 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
@@ -22,14 +22,11 @@ import javax.xml.namespace.QName;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.util.ObjectHelper;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
-import org.apache.cxf.version.Version;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -286,20 +283,11 @@ public class CxfSpringEndpoint extends CxfEndpoint implements ApplicationContext
return qn.getNamespaceURI();
}
-
- @SuppressWarnings("deprecation")
public void setApplicationContext(ApplicationContext ctx) throws BeansException {
applicationContext = ctx;
if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- } else {
- bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
- }
+ bus = BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0b2c650f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
index f3ef4b8..7ed503e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSClientFactoryBean.java
@@ -21,13 +21,10 @@ import java.util.List;
import org.apache.camel.component.cxf.NullFaultListener;
import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.feature.LoggingFeature;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.logging.FaultListener;
-import org.apache.cxf.version.Version;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -80,19 +77,10 @@ public class SpringJAXRSClientFactoryBean extends JAXRSClientFactoryBean
- @SuppressWarnings("deprecation")
@Override
public void setApplicationContext(ApplicationContext ctx) throws BeansException {
if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- setBus(bus);
- } else {
- setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
- }
+ setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0b2c650f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
index 3aa0097..6306d60 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
@@ -21,14 +21,11 @@ import java.util.List;
import org.apache.camel.component.cxf.NullFaultListener;
import org.apache.camel.component.cxf.jaxrs.BeanIdAware;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
-import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.feature.LoggingFeature;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
import org.apache.cxf.logging.FaultListener;
-import org.apache.cxf.version.Version;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -46,18 +43,9 @@ public class SpringJAXRSServerFactoryBean extends JAXRSServerFactoryBean impleme
super(sf);
}
- @SuppressWarnings("deprecation")
public void setApplicationContext(ApplicationContext ctx) throws BeansException {
if (bus == null) {
- if (Version.getCurrentVersion().startsWith("2.3")) {
- // Don't relate on the DefaultBus
- BusFactory factory = new SpringBusFactory(ctx);
- bus = factory.createBus();
- setBus(bus);
- BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
- } else {
- setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
- }
+ setBus(BusWiringBeanFactoryPostProcessor.addDefaultBus(ctx));
}
}