Author: davsclaus Date: Sat Aug 7 09:44:56 2010 New Revision: 983190 URL: http://svn.apache.org/viewvc?rev=983190&view=rev Log: Using explicity camel id
Modified: camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java Modified: camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml?rev=983190&r1=983189&r2=983190&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml Sat Aug 7 09:44:56 2010 @@ -39,7 +39,7 @@ <bean id="loanBroker" class="org.apache.camel.loanbroker.queue.version.LoanBroker"/> - <camel:camelContext> + <camel:camelContext id="myCamel"> <camel:routeBuilder ref="loanBroker"/> </camel:camelContext> Modified: camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml?rev=983190&r1=983189&r2=983190&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/webServiceCamelContext.xml Sat Aug 7 09:44:56 2010 @@ -54,7 +54,7 @@ implementor="#bank3" address="http://localhost:9003/bank3"/> - <camel:camelContext> + <camel:camelContext id="myCamel"> <camel:routeBuilder ref="loanBroker"/> </camel:camelContext> Modified: camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java?rev=983190&r1=983189&r2=983190&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java (original) +++ camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java Sat Aug 7 09:44:56 2010 @@ -28,7 +28,7 @@ public class LoanBrokerServerTest extend public void startLoanBroker() throws Exception { AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext(new String[]{"/META-INF/spring/queueCamelContext.xml"}); - CamelContext camelContext = (CamelContext)applicationContext.getBean("camelContext"); + CamelContext camelContext = (CamelContext)applicationContext.getBean("myCamel"); assertNotNull("The camel context should not be null", camelContext); Thread.sleep(2000); camelContext.stop();