Merge branch 'master' into wip-channels-∂π

akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 

akka-docs/rst/scala/code/docs/actor/FSMDocSpec.scala

@@ -1,11 +1,13 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 
 import language.postfixOps
 
 import akka.testkit.{ AkkaSpec ⇒ MyFavoriteTestFrameWorkPlusAkkaTestKit }
+import akka.util.ByteString
+
 //#test-code
 import akka.actor.Props
 import scala.collection.immutable
@@ -129,8 +131,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
 
         //#transform-syntax
         when(SomeState)(transform {
-          case Event(bytes: Array[Byte], read) ⇒ stay using (read + bytes.length)
-          case Event(bytes: List[Byte], read)  ⇒ stay using (read + bytes.size)
+          case Event(bytes: ByteString, read) ⇒ stay using (read + bytes.length)
         } using {
           case s @ FSM.State(state, read, timeout, stopReason, replies) if read > 1000 ⇒
             goto(Processing)
@@ -144,8 +145,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
         }
 
         when(SomeState)(transform {
-          case Event(bytes: Array[Byte], read) ⇒ stay using (read + bytes.length)
-          case Event(bytes: List[Byte], read)  ⇒ stay using (read + bytes.size)
+          case Event(bytes: ByteString, read) ⇒ stay using (read + bytes.length)
         } using processingTrigger)
         //#alt-transform-syntax
 
@@ -211,7 +211,7 @@ class FSMDocSpec extends MyFavoriteTestFrameWorkPlusAkkaTestKit {
       expectMsg(Batch(immutable.Seq(45)))
     }
 
-    "batch not if uninitialized" in {
+    "not batch if uninitialized" in {
       val buncher = system.actorOf(Props(new Buncher))
       buncher ! Queue(42)
       expectNoMsg

akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 

akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 

akka-docs/rst/scala/code/docs/actor/SchedulerDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 
@@ -29,7 +29,7 @@ class SchedulerDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
     expectMsg(1 second, "foo")
 
     //#schedule-one-off-thunk
-    //Schedules a function to be executed (send the current time) to the testActor after 50ms
+    //Schedules a function to be executed (send a message to the testActor) after 50ms
     system.scheduler.scheduleOnce(50 milliseconds) {
       testActor ! System.currentTimeMillis
     }

akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 

akka-docs/rst/scala/code/docs/actor/UnnestedReceives.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.actor
 

akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.agent
 
@@ -7,127 +7,98 @@ import language.postfixOps
 
 import akka.agent.Agent
 import scala.concurrent.duration._
-import akka.util.Timeout
+import scala.concurrent.{ Await, ExecutionContext }
 import akka.testkit._
+import scala.concurrent.Future
 
 class AgentDocSpec extends AkkaSpec {
-
-  "create and close" in {
+  "create" in {
     //#create
+    import scala.concurrent.ExecutionContext.Implicits.global
     import akka.agent.Agent
-
     val agent = Agent(5)
     //#create
-
-    //#close
-    agent.close()
-    //#close
   }
 
-  "create with implicit system" in {
-    //#create-implicit-system
-    import akka.actor.ActorSystem
-    import akka.agent.Agent
+  "read value" in {
+    import scala.concurrent.ExecutionContext.Implicits.global
+    val agent = Agent(0)
 
-    implicit val system = ActorSystem("app")
+    {
+      //#read-apply
+      val result = agent()
+      //#read-apply
+      result must be === 0
+    }
+    {
+      //#read-get
+      val result = agent.get
+      //#read-get
+      result must be === 0
+    }
 
-    val agent = Agent(5)
-    //#create-implicit-system
-
-    agent.close()
-    system.shutdown()
-  }
-
-  "create with explicit system" in {
-    //#create-explicit-system
-    import akka.actor.ActorSystem
-    import akka.agent.Agent
-
-    val system = ActorSystem("app")
-
-    val agent = Agent(5)(system)
-    //#create-explicit-system
-
-    agent.close()
-    system.shutdown()
+    {
+      //#read-future
+      val future = agent.future
+      //#read-future
+      Await.result(future, 5 seconds) must be === 0
+    }
   }
 
   "send and sendOff" in {
-    val agent = Agent(0)
-    import system.dispatcher
+    val agent = Agent(0)(ExecutionContext.global)
     //#send
-    // send a value
+    // send a value, enqueues this change
+    // of the value of the Agent
     agent send 7
 
-    // send a function
+    // send a function, enqueues this change
+    // to the value of the Agent
     agent send (_ + 1)
     agent send (_ * 2)
     //#send
 
-    def longRunningOrBlockingFunction = (i: Int) ⇒ i * 1
-
+    def longRunningOrBlockingFunction = (i: Int) ⇒ i * 1 // Just for the example code
+    def someExecutionContext() = scala.concurrent.ExecutionContext.Implicits.global // Just for the example code
     //#send-off
+    // the ExecutionContext you want to run the function on
+    implicit val ec = someExecutionContext()
     // sendOff a function
-    agent sendOff (longRunningOrBlockingFunction)
+    agent sendOff longRunningOrBlockingFunction
     //#send-off
 
-    val result = agent.await(Timeout(5 seconds))
-    result must be === 16
+    Await.result(agent.future, 5 seconds) must be === 16
   }
 
-  "read with apply" in {
-    val agent = Agent(0)
+  "alter and alterOff" in {
+    val agent = Agent(0)(ExecutionContext.global)
+    //#alter
+    // alter a value
+    val f1: Future[Int] = agent alter 7
 
-    //#read-apply
-    val result = agent()
-    //#read-apply
+    // alter a function
+    val f2: Future[Int] = agent alter (_ + 1)
+    val f3: Future[Int] = agent alter (_ * 2)
+    //#alter
 
-    result must be === 0
-  }
+    def longRunningOrBlockingFunction = (i: Int) ⇒ i * 1 // Just for the example code
+    def someExecutionContext() = ExecutionContext.global // Just for the example code
 
-  "read with get" in {
-    val agent = Agent(0)
+    //#alter-off
+    // the ExecutionContext you want to run the function on
+    implicit val ec = someExecutionContext()
+    // alterOff a function
+    val f4: Future[Int] = agent alterOff longRunningOrBlockingFunction
+    //#alter-off
 
-    //#read-get
-    val result = agent.get
-    //#read-get
-
-    result must be === 0
-  }
-
-  "read with await" in {
-    val agent = Agent(0)
-
-    //#read-await
-    import scala.concurrent.duration._
-    import akka.util.Timeout
-
-    implicit val timeout = Timeout(5 seconds)
-    val result = agent.await
-    //#read-await
-
-    result must be === 0
-  }
-
-  "read with future" in {
-    val agent = Agent(0)
-
-    //#read-future
-    import scala.concurrent.Await
-
-    implicit val timeout = Timeout(5 seconds)
-    val future = agent.future
-    val result = Await.result(future, timeout.duration)
-    //#read-future
-
-    result must be === 0
+    Await.result(f4, 5 seconds) must be === 16
   }
 
   "transfer example" in {
     //#transfer-example
+    import scala.concurrent.ExecutionContext.Implicits.global
     import akka.agent.Agent
     import scala.concurrent.duration._
-    import akka.util.Timeout
     import scala.concurrent.stm._
 
     def transfer(from: Agent[Int], to: Agent[Int], amount: Int): Boolean = {
@@ -145,25 +116,25 @@ class AgentDocSpec extends AkkaSpec {
     val to = Agent(20)
     val ok = transfer(from, to, 50)
 
-    implicit val timeout = Timeout(5 seconds)
-    val fromValue = from.await // -> 50
-    val toValue = to.await // -> 70
+    val fromValue = from.future // -> 50
+    val toValue = to.future // -> 70
     //#transfer-example
 
-    fromValue must be === 50
-    toValue must be === 70
+    Await.result(fromValue, 5 seconds) must be === 50
+    Await.result(toValue, 5 seconds) must be === 70
+    ok must be === true
   }
 
   "monadic example" in {
+    def println(a: Any) = ()
     //#monadic-example
+    import scala.concurrent.ExecutionContext.Implicits.global
     val agent1 = Agent(3)
     val agent2 = Agent(5)
 
     // uses foreach
-    var result = 0
-    for (value ← agent1) {
-      result = value + 1
-    }
+    for (value ← agent1)
+      println(value)
 
     // uses map
     val agent3 = for (value ← agent1) yield value + 1
@@ -178,15 +149,8 @@ class AgentDocSpec extends AkkaSpec {
     } yield value1 + value2
     //#monadic-example
 
-    result must be === 4
     agent3() must be === 4
     agent4() must be === 4
     agent5() must be === 8
-
-    agent1.close()
-    agent2.close()
-    agent3.close()
-    agent4.close()
-    agent5.close()
   }
 }

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.camel
@@ -70,4 +70,4 @@ object Consumers {
     }
     //#Consumer4
   }
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.camel

akka-docs/rst/scala/code/docs/dataflow/DataflowDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.dataflow
 

akka-docs/rst/scala/code/docs/dispatcher/DispatcherDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.dispatcher
 

akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.event
 

akka-docs/rst/scala/code/docs/extension/ExtensionDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.extension
 

akka-docs/rst/scala/code/docs/extension/SettingsExtensionDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.extension
 

akka-docs/rst/scala/code/docs/future/FutureDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.future
 

akka-docs/rst/scala/code/docs/io/BinaryCoding.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.io
 

akka-docs/rst/scala/code/docs/io/HTTPServer.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.io
 

akka-docs/rst/scala/code/docs/pattern/ScalaTemplate.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.pattern

akka-docs/rst/scala/code/docs/pattern/SchedulerPatternSpec.scala

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ *  Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.pattern

akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.remoting
 
@@ -20,15 +20,15 @@ object RemoteDeploymentDocSpec {
 
 class RemoteDeploymentDocSpec extends AkkaSpec("""
     akka.actor.provider = "akka.remote.RemoteActorRefProvider"
-    akka.remoting.transports.tcp.port = 0
+    akka.remote.netty.tcp.port = 0
 """) with ImplicitSender {
 
   import RemoteDeploymentDocSpec._
 
   val other = ActorSystem("remote", system.settings.config)
-  val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("tcp.akka", "s", "host", 1)).get
+  val address = other.asInstanceOf[ExtendedActorSystem].provider.getExternalAddressFor(Address("akka.tcp", "s", "host", 1)).get
 
-  override def atTermination() { other.shutdown() }
+  override def afterTermination() { other.shutdown() }
 
   "demonstrate programmatic deployment" in {
     //#deploy
@@ -42,8 +42,8 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
 
   "demonstrate address extractor" in {
     //#make-address
-    val one = AddressFromURIString("tcp.akka://sys@host:1234")
-    val two = Address("tcp.akka", "sys", "host", 1234) // this gives the same
+    val one = AddressFromURIString("akka.tcp://sys@host:1234")
+    val two = Address("akka.tcp", "sys", "host", 1234) // this gives the same
     //#make-address
     one must be === two
   }
@@ -56,4 +56,4 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
     //#sample-actor
   }
 
-}
+}

akka-docs/rst/scala/code/docs/routing/ConsistentHashingRouterDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 

akka-docs/rst/scala/code/docs/routing/RouterDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 

akka-docs/rst/scala/code/docs/routing/RouterTypeExample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 
@@ -91,4 +91,4 @@ class ParentActor extends Actor {
   }
 }
 
-//#parentActor
+//#parentActor

akka-docs/rst/scala/code/docs/routing/RouterViaConfigDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 
@@ -155,4 +155,4 @@ class RouterWithConfigDocSpec extends AkkaSpec(RouterWithConfigDocSpec.config) w
     receiveN(10)
   }
 
-}
+}

akka-docs/rst/scala/code/docs/routing/RouterViaConfigExample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 
@@ -49,4 +49,4 @@ object RouterWithConfigExample extends App {
     "router2")
   //#configurableRoutingWithResizer
   1 to 10 foreach { i ⇒ router2 ! Message(i) }
-}
+}

akka-docs/rst/scala/code/docs/routing/RouterViaProgramExample.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.routing
 
@@ -50,4 +50,4 @@ object RoutingProgrammaticallyExample extends App {
     RemoteRouterConfig(RoundRobinRouter(5), addresses)))
   //#remoteRoutees
 
-}
+}

akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.serialization {

akka-docs/rst/scala/code/docs/testkit/PlainWordSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.testkit
 
@@ -44,4 +44,4 @@ class MySpec(_system: ActorSystem) extends TestKit(_system) with ImplicitSender
 
   }
 }
-//#plain-spec
+//#plain-spec

akka-docs/rst/scala/code/docs/testkit/TestKitUsageSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.testkit
 
@@ -157,4 +157,4 @@ object TestKitUsageSpec {
     }
   }
 }
-//#testkit-usage
+//#testkit-usage

akka-docs/rst/scala/code/docs/testkit/TestkitDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.testkit
 
@@ -206,6 +206,16 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
     //#test-special-probe
   }
 
+  "demonstrate probe watch" in {
+    import akka.testkit.TestProbe
+    val target = system.actorFor("/buh")
+    //#test-probe-watch
+    val probe = TestProbe()
+    probe watch target
+    probe.expectMsgType[Terminated].actor must be(target)
+    //#test-probe-watch
+  }
+
   "demonstrate probe reply" in {
     import akka.testkit.TestProbe
     import scala.concurrent.duration._

akka-docs/rst/scala/code/docs/transactor/TransactorDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 
 package docs.transactor

akka-docs/rst/scala/code/docs/zeromq/ZeromqDocSpec.scala

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
  */
 package docs.zeromq