svn commit: r669838 - in /activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfConsumer.java CxfEndpoint.java CxfProducer.java

[ningjiang]

Author: ningjiang
Date: Fri Jun 20 02:25:30 2008
New Revision: 669838

URL: http://svn.apache.org/viewvc?rev=669838&view=rev
Log:
CAMEL-622 Added a option for retrieving the bus created by the CXFEndpoint

Modified:
    
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
    
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=669838&r1=669837&r2=669838&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 Fri Jun 20 02:25:30 2008
@@ -53,6 +53,9 @@
         if (endpoint.getApplicationContext() != null) {
             SpringBusFactory bf = new 
SpringBusFactory(endpoint.getApplicationContext());
             bus = bf.createBus();
+            if (endpoint.isSetDefaultBus()) {
+                BusFactory.setDefaultBus(bus);
+            }
         } else {
             // now we just use the default bus here
             bus = BusFactory.getDefaultBus();

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=669838&r1=669837&r2=669838&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
 Fri Jun 20 02:25:30 2008
@@ -45,10 +45,12 @@
     private boolean isWrapped;
     private boolean isSpringContextEndpoint;
     private boolean inOut = true;
+    private boolean isSetDefaultBus;
     private ConfigurerImpl configurer;
     private CxfEndpointBean cxfEndpointBean;
 
 
+
     public CxfEndpoint(String uri, String address, CxfComponent component) {
         super(uri, component);
         this.component = component;
@@ -111,6 +113,14 @@
         wsdlURL = url;
     }
 
+    public void setSetDefaultBus(boolean set) {
+        isSetDefaultBus = set;
+    }
+
+    public boolean isSetDefaultBus() {
+        return isSetDefaultBus;
+    }
+
     public String getServiceClass() {
         return serviceClass;
 

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=669838&r1=669837&r2=669838&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Fri Jun 20 02:25:30 2008
@@ -111,6 +111,9 @@
         if (endpoint.getApplicationContext() != null) {
             SpringBusFactory bf = new 
SpringBusFactory(endpoint.getApplicationContext());
             bus = bf.createBus();
+            if (endpoint.isSetDefaultBus()) {
+                BusFactory.setDefaultBus(bus);
+            }
         } else {
             // now we just use the default bus here
             bus = BusFactory.getDefaultBus();