Author: davsclaus
Date: Sat Aug 7 08:13:04 2010
New Revision: 983180
URL: http://svn.apache.org/viewvc?rev=983180&view=rev
Log:
Using explict camel context id.
Modified:
camel/trunk/components/camel-scala/src/test/resources/org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
Modified:
camel/trunk/components/camel-scala/src/test/resources/org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/resources/org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml?rev=983180&r1=983179&r2=983180&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/resources/org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml
(original)
+++
camel/trunk/components/camel-scala/src/test/resources/org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml
Sat Aug 7 08:13:04 2010
@@ -22,7 +22,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd";>
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring";>
<package>org.apache.camel.scala.dsl.builder.scan</package>
</camelContext>
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala?rev=983180&r1=983179&r2=983180&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala
Sat Aug 7 08:13:04 2010
@@ -29,7 +29,7 @@ class DiscoverRouteBuilderTest extends T
def testDiscovery = {
val spring = new
ClassPathXmlApplicationContext("org/apache/camel/scala/dsl/builder/scan/scan-camel-context.xml")
- val camel = spring.getBean("camelContext").asInstanceOf[CamelContext]
+ val camel = spring.getBean("myCamel").asInstanceOf[CamelContext]
assertNotNull(camel)
assertEquals(1, camel.getRoutes().size())
