CAMEL-2433 Camel CxfEndpoint should support the set the bus from URI

git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-1.x@905256 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 1, 2010 · 1f5b4b9 · 1f5b4b9
1 parent a9d9e06
commit 1f5b4b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -117,6 +117,10 @@ public CxfExchange createExchange(Message inMessage) {
         return new CxfExchange(getCamelContext(), getExchangePattern(), inMessage);
     }
 
+    public void setBus(Bus bus) {
+        this.bus = bus;
+    }
+
     public Bus getBus() {
         if (bus == null) {
             bus = doGetBus();

diff --git a/.../src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java b/.../src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
@@ -23,6 +23,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor;
+import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
@@ -110,7 +111,8 @@ public CxfSpringEndpointBean(ReflectionServiceFactoryBean factory) {
 
         public void setApplicationContext(ApplicationContext ctx) throws BeansException {
             if (getBus() == null) {
-                Bus bus = BusFactory.getDefaultBus();                
+                SpringBusFactory busFactory = new SpringBusFactory(ctx);
+                Bus bus = busFactory.createBus();
                 setBus(bus);
             }
             BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(getBus(), ctx);