Merging with master

This commit is contained in:
Viktor Klang 2012-07-23 15:49:19 +02:00
commit 985d17de63
61 changed files with 1920 additions and 187 deletions

View file

@ -10,7 +10,7 @@ import akka.actor.Status.Failure
import language.existentials
object CustomRoute {
{
object Sample1 {
//#CustomRoute
import akka.actor.{ Props, ActorSystem, Actor, ActorRef }
import akka.camel.{ CamelMessage, CamelExtension }
@ -37,7 +37,7 @@ object CustomRoute {
//#CustomRoute
}
{
object Sample2 {
//#ErrorThrowingConsumer
import akka.camel.Consumer