Merging with master
This commit is contained in:
commit
985d17de63
61 changed files with 1920 additions and 187 deletions
|
|
@ -5,9 +5,10 @@ import akka.camel.internal.component.{ DurationTypeConverter, ActorComponent }
|
|||
import org.apache.camel.impl.DefaultCamelContext
|
||||
import scala.Predef._
|
||||
import akka.event.Logging
|
||||
import akka.camel.Camel
|
||||
import akka.camel.{ CamelSettings, Camel }
|
||||
import scala.util.control.NonFatal
|
||||
import scala.concurrent.util.Duration
|
||||
|
||||
import org.apache.camel.{ ProducerTemplate, CamelContext }
|
||||
|
||||
/**
|
||||
|
|
@ -29,11 +30,13 @@ private[camel] class DefaultCamel(val system: ActorSystem) extends Camel {
|
|||
val ctx = new DefaultCamelContext
|
||||
ctx.setName(system.name)
|
||||
ctx.setStreamCaching(true)
|
||||
ctx.addComponent("actor", new ActorComponent(this))
|
||||
ctx.addComponent("akka", new ActorComponent(this, system))
|
||||
ctx.getTypeConverterRegistry.addTypeConverter(classOf[Duration], classOf[String], DurationTypeConverter)
|
||||
ctx
|
||||
}
|
||||
|
||||
val settings = new CamelSettings(system.settings.config)
|
||||
|
||||
lazy val template: ProducerTemplate = context.createProducerTemplate()
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue