Tickets #1924 #1925 #2383 #2387 #1927 #1926

Changed unlimited blocking to block up untill the replyTimeout, and added a test for it, where manual Ack is never received ticket #1926

removed unnecesary methods

akka-docs/rst/scala/code/docs/camel/CustomRoute.scala

@@ -48,10 +48,7 @@ object CustomRoute {
       def receive = {
         case msg: CamelMessage ⇒ throw new Exception("error: %s" format msg.body)
       }
-      override def onRouteDefinition(rd: RouteDefinition) = {
-        // Catch any exception and handle it by returning the exception message as response
-        rd.onException(classOf[Exception]).handled(true).transform(Builder.exceptionMessage).end
-      }
+      override def onRouteDefinition = (rd) ⇒ rd.onException(classOf[Exception]).handled(true).transform(Builder.exceptionMessage).end
 
       final override def preRestart(reason: Throwable, message: Option[Any]) {
         sender ! Failure(reason)

akka-docs/rst/scala/code/docs/camel/HttpExample.scala

@@ -21,7 +21,7 @@ object HttpExample {
       def endpointUri = "jetty://http://akka.io/?bridgeEndpoint=true"
 
       override def transformOutgoingMessage(msg: Any) = msg match {
-        case msg: CamelMessage ⇒ msg.addHeaders(msg.headers(Set(Exchange.HTTP_PATH)))
+        case msg: CamelMessage ⇒ msg.copy(headers = msg.headers ++ msg.headers(Set(Exchange.HTTP_PATH)))
       }
 
       override def routeResponse(msg: Any) { transformer forward msg }