Merge with master

This commit is contained in:
Viktor Klang 2012-07-12 21:05:23 +02:00
commit 68848f6631
12 changed files with 909 additions and 13 deletions

View file

@ -27,7 +27,7 @@ private[camel] class DefaultCamel(val system: ActorSystem) extends Camel {
lazy val context: CamelContext = {
val ctx = new DefaultCamelContext
ctx.setName(system.name);
ctx.setName(system.name)
ctx.setStreamCaching(true)
ctx.addComponent("actor", new ActorComponent(this))
ctx.getTypeConverterRegistry.addTypeConverter(classOf[Duration], classOf[String], DurationTypeConverter)