Author: ningjiang
Date: Wed Nov 25 03:20:24 2009
New Revision: 883967
URL: http://svn.apache.org/viewvc?rev=883967&view=rev
Log:
CAMEL-2216 better code for understanding
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=883967&r1=883966&r2=883967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Wed Nov 25 03:20:24 2009
@@ -190,7 +190,7 @@
}
protected Bus doGetBus() {
- return SpringBusFactory.newInstance().createBus();
+ return BusFactory.newInstance().createBus();
}
/**
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=883967&r1=883966&r2=883967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
Wed Nov 25 03:20:24 2009
@@ -24,6 +24,7 @@
import org.w3c.dom.Element;
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.service.factory.ReflectionServiceFactoryBean;
@@ -92,7 +93,8 @@
applicationContext = ctx;
if (getBus() == null) {
// Don't relate on the DefaultBus
- Bus bus = SpringBusFactory.newInstance().createBus();
+ BusFactory factory = new SpringBusFactory();
+ Bus bus = factory.createBus();
setBus(bus);
}
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(getBus(), ctx);
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=883967&r1=883966&r2=883967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
Wed Nov 25 03:20:24 2009
@@ -83,7 +83,8 @@
public void setApplicationContext(ApplicationContext ctx) throws
BeansException {
if (getBus() == null) {
// Don't relate on the DefaultBus
- Bus bus = SpringBusFactory.newInstance().createBus();
+ BusFactory factory = new SpringBusFactory();
+ Bus bus = factory.createBus();
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
setBus(bus);
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=883967&r1=883966&r2=883967&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
Wed Nov 25 03:20:24 2009
@@ -100,7 +100,8 @@
public void setApplicationContext(ApplicationContext ctx) throws
BeansException {
if (getBus() == null) {
// Don't relate on the DefaultBus
- Bus bus = SpringBusFactory.newInstance().createBus();
+ BusFactory factory = new SpringBusFactory();
+ Bus bus = factory.createBus();
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
setBus(bus);
}