Author: ningjiang Date: Thu Nov 15 06:45:38 2012 New Revision: 1409663 URL: http://svn.apache.org/viewvc?rev=1409663&view=rev Log: Try to fix the camel-cxf related test failures
Merged revisions 1409651 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1409651 | ningjiang | 2012-11-15 13:32:26 +0800 (Thu, 15 Nov 2012) | 1 line Try to fix the camel-cxf related test failures ........ Modified: camel/branches/camel-2.10.x/ (props changed) camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java camel/branches/camel-2.10.x/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1409651 Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java?rev=1409663&r1=1409662&r2=1409663&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java Thu Nov 15 06:45:38 2012 @@ -104,7 +104,7 @@ public class CxfConsumerTest extends Cam ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean(); clientBean.setAddress(SIMPLE_ENDPOINT_ADDRESS); clientBean.setServiceClass(HelloService.class); - clientBean.setBus(BusFactory.getDefaultBus()); + clientBean.setBus(BusFactory.newInstance().createBus()); HelloService client = (HelloService) proxyFactory.create(); Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java?rev=1409663&r1=1409662&r2=1409663&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java Thu Nov 15 06:45:38 2012 @@ -30,6 +30,7 @@ import org.apache.camel.component.cxf.co import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.cxf.BusFactory; import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.endpoint.Server; import org.apache.cxf.frontend.ClientFactoryBean; @@ -145,7 +146,8 @@ public class CxfMixedModeRouterTest exte ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean(); ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean(); clientBean.setAddress(ROUTER_ADDRESS); - clientBean.setServiceClass(HelloService.class); + clientBean.setServiceClass(HelloService.class); + clientBean.setBus(BusFactory.newInstance().createBus()); HelloService client = (HelloService) proxyFactory.create(); return client; Modified: camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java?rev=1409663&r1=1409662&r2=1409663&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java (original) +++ camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadBareSoapTest.java Thu Nov 15 06:45:38 2012 @@ -25,6 +25,7 @@ import javax.xml.ws.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.cxf.BusFactory; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.junit.BeforeClass; import org.junit.Test; @@ -66,6 +67,7 @@ public class CxfPayLoadBareSoapTest exte ClientProxyFactoryBean factory = new ClientProxyFactoryBean(); factory.setServiceClass(BareSoapService.class); factory.setAddress(PROXY_URL); + factory.setBus(BusFactory.newInstance().createBus()); BareSoapService client = (BareSoapService) factory.create(); client.doSomething(); Modified: camel/branches/camel-2.10.x/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java?rev=1409663&r1=1409662&r2=1409663&view=diff ============================================================================== --- camel/branches/camel-2.10.x/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java (original) +++ camel/branches/camel-2.10.x/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java Thu Nov 15 06:45:38 2012 @@ -38,7 +38,8 @@ public final class Client { ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean(); clientBean.setAddress(address); clientBean.setServiceClass(LoanBrokerWS.class); - clientBean.setBus(BusFactory.getDefaultBus()); + // just create a new bus for use + clientBean.setBus(BusFactory.newInstance().createBus()); return (LoanBrokerWS) proxyFactory.create(); }
