The unborkening of master, fixing breakage in camel docs

akka-docs/scala/camel.rst

@@ -63,7 +63,8 @@ component`_), only the actor's endpointUri method must be changed.
 Actors can also trigger message exchanges with external systems i.e. produce to
 Camel endpoints.
 
-.. includecode:: code/akka/docs/camel/Introduction.scala#Producer
+.. includecode:: code/akka/docs/camel/Introduction.scala
+                :include: imports,Producer
 
 In the above example, any message sent to this actor will be added (produced) to
 the example JMS queue. Producer actors may choose from the same set of Camel

akka-docs/scala/code/akka/docs/camel/Introduction.scala

@@ -1,44 +1,48 @@
 package akka.docs.camel
 
-import akka.actor._
+object wrapper {
-import akka.camel._
+  {
+    //#Consumer-mina
+    import akka.camel.{ CamelMessage, Consumer }
 
-//#Consumer-mina
+    class MyActor extends Consumer {
-import akka.actor.Actor
+      def endpointUri = "mina:tcp://localhost:6200?textline=true"
-import akka.actor.Actor._
-import akka.camel.{CamelMessage, Consumer}
 
-class MyActor extends Consumer {
+      def receive = {
-  def endpointUri = "mina:tcp://localhost:6200?textline=true"
+        case msg: CamelMessage ⇒ { /* ... */ }
+        case _                 ⇒ { /* ... */ }
+      }
+    }
 
-  def receive = {
+    // start and expose actor via tcp
-    case msg: CamelMessage => { /* ... */}
+    import akka.actor.{ ActorSystem, Props }
-    case _            => { /* ... */}
+
+    val sys = ActorSystem("camel")
+    val myActor = sys.actorOf(Props[MyActor])
+    //#Consumer-mina
   }
-}
+  {
+    //#Consumer
+    import akka.camel.{ CamelMessage, Consumer }
 
-// start and expose actor via tcp
+    class MyActor extends Consumer {
-val sys = ActorSystem("camel")
+      def endpointUri = "jetty:http://localhost:8877/example"
-val myActor = sys.actorOf(Props[MyActor])
-//#Consumer-mina
 
-
+      def receive = {
-//#Consumer
+        case msg: CamelMessage ⇒ { /* ... */ }
-class MyActor extends Consumer {
+        case _                 ⇒ { /* ... */ }
-  def endpointUri = "jetty:http://localhost:8877/example"
+      }
-
+    }
-  def receive = {
+    //#Consumer
-    case msg: CamelMessage => { /* ... */}
-    case _            => { /* ... */}
   }
-}
+  {
-//#Consumer
+    //#Producer
+    import akka.actor.Actor
+    import akka.camel.{ Producer, Oneway }
 
-//#Producer
+    class MyActor extends Actor with Producer with Oneway {
-import akka.actor.Actor
+      def endpointUri = "jms:queue:example"
-import akka.camel.{Producer, Oneway}
+    }
-
+    //#Producer
-class MyActor extends Actor with Producer with Oneway {
+  }
-  def endpointUri = "jms:queue:example"
+}
-}
-//#Producer

project/AkkaBuild.scala

@@ -320,7 +320,7 @@ object AkkaBuild extends Build {
     id = "akka-docs",
     base = file("akka-docs"),
     dependencies = Seq(actor, testkit % "test->test", remote, cluster, slf4j, agent, transactor,
-        fileMailbox, mongoMailbox, redisMailbox, beanstalkMailbox, zookeeperMailbox, zeroMQ),
+        fileMailbox, mongoMailbox, redisMailbox, beanstalkMailbox, zookeeperMailbox, zeroMQ, camel),
     settings = defaultSettings ++ Seq(
       unmanagedSourceDirectories in Test <<= baseDirectory { _ ** "code" get },
       libraryDependencies ++= Dependencies.docs,