Author: ningjiang
Date: Mon Jan 19 23:26:07 2009
New Revision: 735951
URL: http://svn.apache.org/viewvc?rev=735951&view=rev
Log:
CAMEL-1275 Fixed the camel-cxf build error with application context refesh
doesn't be called.
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=735951&r1=735950&r2=735951&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
Mon Jan 19 23:26:07 2009
@@ -109,10 +109,10 @@
public void setApplicationContext(ApplicationContext ctx) throws
BeansException {
if (getBus() == null) {
- Bus bus = BusFactory.getThreadDefaultBus();
+ Bus bus = BusFactory.getDefaultBus();
setBus(bus);
}
-
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(bus, ctx);
+
BusWiringBeanFactoryPostProcessor.updateBusReferencesInContext(getBus(), ctx);
}
}
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java?rev=735951&r1=735950&r2=735951&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
Mon Jan 19 23:26:07 2009
@@ -85,7 +85,8 @@
if (jaxwsEndpoint != null) {
jaxwsEndpoint.stop();
}
- }
+ CXFBusFactory.setDefaultBus(null);
+ };
public void testInvokingSimpleServerWithParams() throws Exception {
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=735951&r1=735950&r2=735951&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
Mon Jan 19 23:26:07 2009
@@ -35,6 +35,7 @@
import org.apache.camel.wsdl_first.PersonImpl;
import org.apache.camel.wsdl_first.PersonService;
import org.apache.camel.wsdl_first.UnknownPersonFault;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.jaxws.EndpointImpl;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -71,8 +72,9 @@
protected void tearDown() throws Exception {
if (server != null) {
server.stop();
- }
+ }
super.tearDown();
+ BusFactory.setDefaultBus(null);
}
protected RouteBuilder createRouteBuilder() {
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=735951&r1=735950&r2=735951&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
Mon Jan 19 23:26:07 2009
@@ -26,6 +26,7 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.cxf.CxfConstants;
+import org.apache.cxf.BusFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -37,6 +38,7 @@
protected void tearDown() throws Exception {
ctx.close();
+ BusFactory.setDefaultBus(null);
}
public void testCxfEndpointBeanDefinitionParser() {
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java?rev=735951&r1=735950&r2=735951&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfEndpointUtilsWithSpringTest.java
Mon Jan 19 23:26:07 2009
@@ -23,6 +23,7 @@
import org.apache.camel.component.cxf.DataFormat;
import org.apache.camel.component.cxf.HelloServiceImpl;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.cxf.BusFactory;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -43,6 +44,7 @@
applicationContext.destroy();
}
super.tearDown();
+ BusFactory.setDefaultBus(null);
}
@Override
